Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix long tab names and syncing tab renaming (#1160)

Browse Source
This commit is contained in:
Mike Sawka 2024-10-27 23:01:47 -07:00 committed by GitHub
parent be5d73af21
commit b746a0bfb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app/store/global.ts
View File

@ -140,6 +140,7 @@ function initGlobalAtoms(initOpts: GlobalInitOptions) {
return connStatuses;
});
const flashErrorsAtom = atom<FlashErrorType[]>([]);
const reinitVersion = atom(0);
atoms = {
// initialized in wave.ts (will not be null inside of application)
clientId: clientIdAtom,
@ -159,6 +160,7 @@ function initGlobalAtoms(initOpts: GlobalInitOptions) {
modalOpen,
allConnStatus: allConnStatusAtom,
flashErrors: flashErrorsAtom,
reinitVersion,
};
}

10
frontend/app/tab/tab.less
View File

@ -49,6 +49,10 @@
font-size: 11px;
font-weight: 500;
text-shadow: 0px 0px 4px rgba(0, 0, 0, 0.25);
overflow: hidden;
width: calc(100% - 10px);
text-overflow: ellipsis;
text-align: center;
&.focused {
outline: none;
@ -76,6 +80,12 @@
&:hover .close {
visibility: visible;
backdrop-filter: blur(3px);
&:hover {
color: var(--main-text-color);
// background-color: var(--highlight-bg-color);
}
}
}

12
frontend/app/tab/tabbar.tsx
View File

@ -96,11 +96,6 @@ const ConfigErrorIcon = ({ buttonRef }: { buttonRef: React.RefObject<HTMLElement
Config Error
</Button>
);
return (
<div className="config-error" ref={buttonRef as React.RefObject<HTMLDivElement>}>
<i className="fa fa-solid fa-exclamation-triangle" />
</div>
);
};
const TabBar = React.memo(({ workspace }: TabBarProps) => {
@ -254,6 +249,13 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
debounce(100, () => saveTabsPosition())();
}, [tabIds, newTabId, isFullScreen]);
const reinitVersion = useAtomValue(atoms.reinitVersion);
useEffect(() => {
if (reinitVersion > 0) {
setSizeAndPosition();
}
}, [reinitVersion]);
useEffect(() => {
window.addEventListener("resize", () => handleResizeTabs());
return () => {

1
frontend/types/custom.d.ts vendored
View File

@ -24,6 +24,7 @@ declare global {
modalOpen: jotai.PrimitiveAtom<boolean>;
allConnStatus: jotai.Atom<ConnStatus[]>;
flashErrors: jotai.PrimitiveAtom<FlashErrorType[]>;
reinitVersion: jotai.PrimitiveAtom<number>;
};
type WritableWaveObjectAtom<T extends WaveObj> = jotai.WritableAtom<T, [value: T], void>;

13
frontend/wave.ts
View File

@ -85,11 +85,22 @@ async function reinitWave() {
getApi().sendLog("Reinit Wave");
const client = await WOS.reloadWaveObject<Client>(WOS.makeORef("client", savedInitOpts.clientId));
const waveWindow = await WOS.reloadWaveObject<WaveWindow>(WOS.makeORef("window", savedInitOpts.windowId));
await WOS.reloadWaveObject<Workspace>(WOS.makeORef("workspace", waveWindow.workspaceid));
const ws = await WOS.reloadWaveObject<Workspace>(WOS.makeORef("workspace", waveWindow.workspaceid));
const initialTab = await WOS.reloadWaveObject<Tab>(WOS.makeORef("tab", savedInitOpts.tabId));
await WOS.reloadWaveObject<LayoutState>(WOS.makeORef("layout", initialTab.layoutstate));
reloadAllWorkspaceTabs(ws);
document.title = `Wave Terminal - ${initialTab.name}`; // TODO update with tab name change
getApi().setWindowInitStatus("wave-ready");
globalStore.set(atoms.reinitVersion, globalStore.get(atoms.reinitVersion) + 1);
}
function reloadAllWorkspaceTabs(ws: Workspace) {
if (ws == null || ws.tabids == null) {
return;
}
ws.tabids.forEach((tabid) => {
WOS.reloadWaveObject<Tab>(WOS.makeORef("tab", tabid));
});
}
function loadAllWorkspaceTabs(ws: Workspace) {