@kubohiroya/turbowarp-plus-editor-workbench 0.7.0 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dockview-stage.d.ts +9 -0
- package/dist/dockview-stage.js +30 -3
- package/dist/drawer-views.d.ts +1 -0
- package/dist/drawer-views.js +4 -0
- package/dist/sprite-tabs.js +31 -5
- package/dist/stage-drawer-drag.d.ts +5 -1
- package/dist/stage-drawer-drag.js +18 -3
- package/dist/stage-launcher.d.ts +8 -1
- package/dist/stage-launcher.js +22 -7
- package/dist/stage-surface.d.ts +3 -2
- package/dist/stage-surface.js +14 -2
- package/dist/standard-layout.d.ts +8 -2
- package/dist/standard-layout.js +65 -19
- package/dist/workspace-layout.d.ts +15 -0
- package/dist/workspace-layout.js +17 -0
- package/package.json +1 -1
- package/src/dockview-stage.ts +35 -3
- package/src/drawer-views.ts +7 -0
- package/src/sprite-tabs.ts +30 -5
- package/src/stage-drawer-drag.ts +22 -7
- package/src/stage-launcher.ts +24 -6
- package/src/stage-surface.ts +17 -3
- package/src/standard-layout.ts +65 -21
- package/src/workspace-layout.ts +31 -0
package/dist/dockview-stage.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { StageDrawerLayout } from './workspace-layout.ts';
|
|
1
2
|
type StageCommands = {
|
|
2
3
|
open(): void;
|
|
3
4
|
close(): void;
|
|
@@ -6,6 +7,11 @@ export interface DockviewStagePane {
|
|
|
6
7
|
title: string;
|
|
7
8
|
attach(destination: HTMLElement | null): void;
|
|
8
9
|
connect(commands: StageCommands | null): void;
|
|
10
|
+
drawer?: {
|
|
11
|
+
read(): StageDrawerLayout | undefined;
|
|
12
|
+
restore(layout?: StageDrawerLayout): void;
|
|
13
|
+
subscribe(listener: () => void): () => void;
|
|
14
|
+
};
|
|
9
15
|
}
|
|
10
16
|
export declare function useDockviewStage(enabled: boolean, locale: string): {
|
|
11
17
|
surface: HTMLDivElement;
|
|
@@ -14,6 +20,9 @@ export declare function useDockviewStage(enabled: boolean, locale: string): {
|
|
|
14
20
|
commands: StageCommands;
|
|
15
21
|
inlineRef: (element: HTMLElement | null) => void;
|
|
16
22
|
suspend: (value: boolean) => void;
|
|
23
|
+
drawerLayout: StageDrawerLayout;
|
|
24
|
+
updateDrawer: (patch: Partial<StageDrawerLayout>) => void;
|
|
25
|
+
resetDrawerPresentation: () => void;
|
|
17
26
|
openLabel: string;
|
|
18
27
|
closeLabel: string;
|
|
19
28
|
};
|
package/dist/dockview-stage.js
CHANGED
|
@@ -12,6 +12,25 @@ export function useDockviewStage(enabled, locale) {
|
|
|
12
12
|
const suspended = React.useRef(false);
|
|
13
13
|
const [docked, setDocked] = React.useState(false);
|
|
14
14
|
const [commands, setCommands] = React.useState(null);
|
|
15
|
+
const [drawerLayout, setDrawerLayout] = React.useState();
|
|
16
|
+
const savedDrawer = React.useRef();
|
|
17
|
+
const drawerListeners = React.useMemo(() => new Set(), []);
|
|
18
|
+
const restoreDrawer = React.useCallback((layout) => {
|
|
19
|
+
savedDrawer.current = layout;
|
|
20
|
+
setDrawerLayout(layout);
|
|
21
|
+
}, []);
|
|
22
|
+
const updateDrawer = React.useCallback((patch) => {
|
|
23
|
+
const previous = savedDrawer.current;
|
|
24
|
+
const next = { open: false, selected: false, ...previous, ...patch };
|
|
25
|
+
if (next.open === Boolean(previous?.open) && next.selected === Boolean(previous?.selected) &&
|
|
26
|
+
next.pinned === previous?.pinned && next.position === previous?.position && next.width === previous?.width)
|
|
27
|
+
return;
|
|
28
|
+
restoreDrawer(next.open || next.selected || next.pinned !== undefined || next.position || next.width ?
|
|
29
|
+
next : undefined);
|
|
30
|
+
for (const listener of drawerListeners)
|
|
31
|
+
listener();
|
|
32
|
+
}, [drawerListeners, restoreDrawer]);
|
|
33
|
+
const resetDrawerPresentation = React.useCallback(() => updateDrawer({ open: false, selected: false }), [updateDrawer]);
|
|
15
34
|
const move = React.useCallback(() => {
|
|
16
35
|
const destination = suspended.current ? inline.current : dock.current ?? inline.current;
|
|
17
36
|
if (surface && destination && surface.parentElement !== destination)
|
|
@@ -35,10 +54,18 @@ export function useDockviewStage(enabled, locale) {
|
|
|
35
54
|
move();
|
|
36
55
|
setDocked(Boolean(destination));
|
|
37
56
|
},
|
|
38
|
-
connect: setCommands
|
|
39
|
-
|
|
57
|
+
connect: setCommands,
|
|
58
|
+
drawer: {
|
|
59
|
+
read: () => savedDrawer.current,
|
|
60
|
+
restore: restoreDrawer,
|
|
61
|
+
subscribe(listener) {
|
|
62
|
+
drawerListeners.add(listener);
|
|
63
|
+
return () => { drawerListeners.delete(listener); };
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}), [japanese, move, restoreDrawer, drawerListeners]);
|
|
40
67
|
return surface && {
|
|
41
|
-
surface, pane, docked, commands, inlineRef, suspend,
|
|
68
|
+
surface, pane, docked, commands, inlineRef, suspend, drawerLayout, updateDrawer, resetDrawerPresentation,
|
|
42
69
|
openLabel: japanese ? 'ステージをタブで開く' : 'Open stage in workspace',
|
|
43
70
|
closeLabel: japanese ? 'ステージを元の位置に戻す' : 'Return stage from workspace'
|
|
44
71
|
};
|
package/dist/drawer-views.d.ts
CHANGED
|
@@ -47,6 +47,7 @@ declare const names: {
|
|
|
47
47
|
export declare const agentsIconPath = "M8 1.5 9.4 6.6 14.5 8 9.4 9.4 8 14.5 6.6 9.4 1.5 8 6.6 6.6Z";
|
|
48
48
|
export declare const isJapanese: (locale: string) => boolean;
|
|
49
49
|
export declare const drawerLabel: (id: keyof typeof names, locale: string) => "スプライト一覧" | "Sprites" | "プロジェクトフォルダ" | "Project folder" | "Git 履歴" | "Git history" | "AI エージェント" | "AI agents" | "ドロワーの表示" | "Drawer views";
|
|
50
|
+
export declare function drawerPinIcon(element: typeof import('react').createElement, pinned: boolean): import("react").ReactSVGElement;
|
|
50
51
|
/** The supported host views in button order, without unknown or repeated ids. */
|
|
51
52
|
export declare function availableDrawerViews(drawerViews: DrawerViews | undefined): DrawerView[];
|
|
52
53
|
/** The bar is shown only when the host supplies something besides the sprite list. */
|
package/dist/drawer-views.js
CHANGED
|
@@ -11,6 +11,10 @@ const names = {
|
|
|
11
11
|
export const agentsIconPath = 'M8 1.5 9.4 6.6 14.5 8 9.4 9.4 8 14.5 6.6 9.4 1.5 8 6.6 6.6Z';
|
|
12
12
|
export const isJapanese = (locale) => /^ja(?:-|$)/i.test(locale ?? '');
|
|
13
13
|
export const drawerLabel = (id, locale) => names[id][isJapanese(locale) ? 0 : 1];
|
|
14
|
+
export function drawerPinIcon(element, pinned) {
|
|
15
|
+
return element('svg', { 'aria-hidden': true, width: 14, height: 14, viewBox: '0 0 16 16',
|
|
16
|
+
fill: pinned ? 'currentColor' : 'none', stroke: 'currentColor', strokeWidth: 1.2, strokeLinejoin: 'round' }, element('path', { d: 'M9 2 14 7 12 8l-2 3-5-5 3-2 1-2Z' }), element('path', { d: 'm7.5 8.5-4 4' }), !pinned && element('path', { d: 'M2 2l12 12', strokeLinecap: 'round' }));
|
|
17
|
+
}
|
|
14
18
|
/** The supported host views in button order, without unknown or repeated ids. */
|
|
15
19
|
export function availableDrawerViews(drawerViews) {
|
|
16
20
|
const views = drawerViews?.views ?? [];
|
package/dist/sprite-tabs.js
CHANGED
|
@@ -135,6 +135,7 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
135
135
|
const window = document.defaultView;
|
|
136
136
|
const documentWorkspace = multiView && getDocumentWorkspace(vm);
|
|
137
137
|
let pendingRestore = Boolean(persistence);
|
|
138
|
+
let drawerEditedDuringRestore = false;
|
|
138
139
|
let restoreFrame;
|
|
139
140
|
let restoreTimeout;
|
|
140
141
|
let saveFrame;
|
|
@@ -811,8 +812,9 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
811
812
|
const popouts = [...new Set(reopenable.values())]
|
|
812
813
|
.map(popout => ({ ...popout, panels: popout.panels.filter(id => reopenable.get(id) === popout && views.has(id) && panels[id]?.kind === 'sprite') }))
|
|
813
814
|
.filter(popout => popout.panels.length);
|
|
815
|
+
const stageDrawer = stagePane?.drawer?.read();
|
|
814
816
|
return { version: 1, project: projectSignature(targets), ...saved,
|
|
815
|
-
editingView: active?.id, panels, ...(popouts.length && { popouts }) };
|
|
817
|
+
editingView: active?.id, panels, ...(stageDrawer && { stageDrawer }), ...(popouts.length && { popouts }) };
|
|
816
818
|
}
|
|
817
819
|
function writeLayout() {
|
|
818
820
|
saveFrame = undefined;
|
|
@@ -887,15 +889,19 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
887
889
|
pendingRestore = false;
|
|
888
890
|
window.clearTimeout(restoreTimeout);
|
|
889
891
|
restoreTimeout = undefined;
|
|
892
|
+
if (drawerEditedDuringRestore) {
|
|
893
|
+
drawerEditedDuringRestore = false;
|
|
894
|
+
scheduleSave();
|
|
895
|
+
}
|
|
890
896
|
updateLayoutState();
|
|
891
897
|
}
|
|
892
|
-
/** The
|
|
898
|
+
/** The tab arrangement and drawer state used to detect a change from the initial layout. */
|
|
893
899
|
function layoutShape(layout) {
|
|
894
900
|
const reference = (id) => layout.panels[id] ?? null;
|
|
895
901
|
const shape = (node) => Array.isArray(node.data) ? node.data.map(shape) :
|
|
896
902
|
node.data.views.map(reference);
|
|
897
903
|
return JSON.stringify([layout.grid.orientation, shape(layout.grid.root),
|
|
898
|
-
(layout.popouts ?? []).map(popout => popout.panels.map(reference))]);
|
|
904
|
+
(layout.popouts ?? []).map(popout => popout.panels.map(reference)), layout.stageDrawer]);
|
|
899
905
|
}
|
|
900
906
|
function identifyProject() {
|
|
901
907
|
try {
|
|
@@ -925,7 +931,7 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
925
931
|
/** Keep the layout the project opened with, so leaving it unchanged adds no record. */
|
|
926
932
|
function keepInitialLayout() {
|
|
927
933
|
const layout = captureLayout();
|
|
928
|
-
initialShape = layout && layoutShape(layout);
|
|
934
|
+
initialShape = layout && layoutShape({ ...layout, stageDrawer: undefined });
|
|
929
935
|
finishRestore();
|
|
930
936
|
}
|
|
931
937
|
function restoreLayout() {
|
|
@@ -938,8 +944,13 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
938
944
|
const signature = projectSignature(targets);
|
|
939
945
|
if (!layoutSession)
|
|
940
946
|
return openLayoutSession(signature);
|
|
941
|
-
if (!pendingRestore)
|
|
947
|
+
if (!pendingRestore) {
|
|
948
|
+
if (drawerEditedDuringRestore) {
|
|
949
|
+
drawerEditedDuringRestore = false;
|
|
950
|
+
scheduleSave();
|
|
951
|
+
}
|
|
942
952
|
return;
|
|
953
|
+
}
|
|
943
954
|
reopenable.clear();
|
|
944
955
|
// A project found by its file, folder or desktop key keeps its tabs even after its sprites were renamed.
|
|
945
956
|
const exact = layoutSession.exact;
|
|
@@ -998,6 +1009,7 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
998
1009
|
...Object.values(panels).map(panel => panel.title)]));
|
|
999
1010
|
for (const [id, view] of resolvedSprites)
|
|
1000
1011
|
panels[id].title = tabTitle(view);
|
|
1012
|
+
const restoreDrawer = !drawerEditedDuringRestore;
|
|
1001
1013
|
finishRestore();
|
|
1002
1014
|
syncing = true;
|
|
1003
1015
|
try {
|
|
@@ -1010,6 +1022,11 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
1010
1022
|
for (const [id, request] of resolvedDocuments)
|
|
1011
1023
|
documents.set(id, { request });
|
|
1012
1024
|
dockview.fromJSON({ grid: kept.grid, activeGroup: kept.activeGroup, panels });
|
|
1025
|
+
if (restoreDrawer) {
|
|
1026
|
+
const drawer = stored.stageDrawer;
|
|
1027
|
+
stagePane?.drawer?.restore(drawer && dockview.getPanel(stagePanelId) ?
|
|
1028
|
+
{ ...drawer, open: false, selected: false } : drawer);
|
|
1029
|
+
}
|
|
1013
1030
|
for (const popout of stored.popouts ?? []) {
|
|
1014
1031
|
for (const id of popout.panels)
|
|
1015
1032
|
if (views.has(id))
|
|
@@ -1046,6 +1063,8 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
1046
1063
|
layoutSession = undefined;
|
|
1047
1064
|
initialShape = undefined;
|
|
1048
1065
|
pendingRestore = true;
|
|
1066
|
+
drawerEditedDuringRestore = false;
|
|
1067
|
+
stagePane?.drawer?.restore();
|
|
1049
1068
|
if (saveFrame !== undefined)
|
|
1050
1069
|
window.cancelAnimationFrame(saveFrame);
|
|
1051
1070
|
saveFrame = undefined;
|
|
@@ -1144,6 +1163,11 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
1144
1163
|
const unsubscribeDocuments = persistence && documentWorkspace && documentWorkspace.subscribe(scheduleRestore);
|
|
1145
1164
|
projectLoading = Boolean(persistence && persistence.isProjectLoading?.());
|
|
1146
1165
|
const unsubscribeProject = persistence && persistence.subscribeProject?.(projectChanged);
|
|
1166
|
+
const unsubscribeDrawer = persistence && stagePane?.drawer?.subscribe(() => {
|
|
1167
|
+
if (pendingRestore || !layoutSession)
|
|
1168
|
+
drawerEditedDuringRestore = true;
|
|
1169
|
+
scheduleSave();
|
|
1170
|
+
});
|
|
1147
1171
|
layoutStore?.readTabsPosition().then(position => {
|
|
1148
1172
|
if (!disposed && !tabsChosen && position === 'left')
|
|
1149
1173
|
setVerticalTabs(true, false);
|
|
@@ -1186,6 +1210,8 @@ export function mountSpriteTabs(root, content, options) {
|
|
|
1186
1210
|
unsubscribeDocuments();
|
|
1187
1211
|
if (unsubscribeProject)
|
|
1188
1212
|
unsubscribeProject();
|
|
1213
|
+
if (unsubscribeDrawer)
|
|
1214
|
+
unsubscribeDrawer();
|
|
1189
1215
|
if (disconnectDocuments)
|
|
1190
1216
|
disconnectDocuments();
|
|
1191
1217
|
root.removeEventListener('click', guardDocumentClose, true);
|
|
@@ -1 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import type { StageDrawerPosition } from './workspace-layout.ts';
|
|
2
|
+
export declare function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, editor: HTMLElement, focus: () => void, onPositionChange: (position: StageDrawerPosition) => void): {
|
|
3
|
+
setPosition: (next?: StageDrawerPosition) => void;
|
|
4
|
+
dispose: () => void;
|
|
5
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const controls = 'button, input, select, textarea, label, a[href], img, ' +
|
|
2
2
|
'[role="button"], [role="slider"], [role="menu"], [tabindex], [contenteditable]';
|
|
3
3
|
const clamp = (value) => Math.max(0, Math.min(1, value));
|
|
4
|
-
export function attachStageDrawerDrag(drawer, stage, editor, focus) {
|
|
4
|
+
export function attachStageDrawerDrag(drawer, stage, editor, focus, onPositionChange) {
|
|
5
5
|
const document = drawer.ownerDocument;
|
|
6
6
|
const view = document.defaultView;
|
|
7
7
|
let position;
|
|
@@ -89,11 +89,25 @@ export function attachStageDrawerDrag(drawer, stage, editor, focus) {
|
|
|
89
89
|
if (resizeDrag?.id === event.pointerId) {
|
|
90
90
|
place();
|
|
91
91
|
resizeDrag = undefined;
|
|
92
|
+
if (position)
|
|
93
|
+
onPositionChange({ ...position });
|
|
92
94
|
}
|
|
93
95
|
if (drag?.id !== event.pointerId)
|
|
94
96
|
return;
|
|
97
|
+
const moved = drag.moved;
|
|
95
98
|
drag = undefined;
|
|
96
99
|
stage.removeAttribute('data-stage-drawer-dragging');
|
|
100
|
+
if (moved && position)
|
|
101
|
+
onPositionChange({ ...position });
|
|
102
|
+
}
|
|
103
|
+
function setPosition(next) {
|
|
104
|
+
position = next && { ...next };
|
|
105
|
+
if (!position) {
|
|
106
|
+
stage.removeAttribute('data-stage-drawer-positioned');
|
|
107
|
+
stage.style.removeProperty('--plus-stage-drawer-x');
|
|
108
|
+
stage.style.removeProperty('--plus-stage-drawer-y');
|
|
109
|
+
}
|
|
110
|
+
place();
|
|
97
111
|
}
|
|
98
112
|
const handlers = { pointerdown: start, pointermove: move, pointerup: finish,
|
|
99
113
|
pointercancel: finish, lostpointercapture: finish };
|
|
@@ -105,7 +119,7 @@ export function attachStageDrawerDrag(drawer, stage, editor, focus) {
|
|
|
105
119
|
observer.observe(stage);
|
|
106
120
|
view.addEventListener('resize', resize);
|
|
107
121
|
place();
|
|
108
|
-
|
|
122
|
+
function dispose() {
|
|
109
123
|
for (const [name, handler] of Object.entries(handlers))
|
|
110
124
|
drawer.removeEventListener(name, handler);
|
|
111
125
|
if (drag && drawer.hasPointerCapture(drag.id))
|
|
@@ -118,5 +132,6 @@ export function attachStageDrawerDrag(drawer, stage, editor, focus) {
|
|
|
118
132
|
stage.removeAttribute('data-stage-drawer-edge');
|
|
119
133
|
stage.style.removeProperty('--plus-stage-drawer-x');
|
|
120
134
|
stage.style.removeProperty('--plus-stage-drawer-y');
|
|
121
|
-
}
|
|
135
|
+
}
|
|
136
|
+
return { setPosition, dispose };
|
|
122
137
|
}
|
package/dist/stage-launcher.d.ts
CHANGED
|
@@ -2,6 +2,12 @@ import React, { type ComponentType } from 'react';
|
|
|
2
2
|
declare const modes: readonly ["window", "tab", "drawer"];
|
|
3
3
|
type StageMode = typeof modes[number];
|
|
4
4
|
export declare function stagePresentationItems(locale: string, current: StageMode | null, actions: Partial<Record<StageMode, () => void>>): MenuItem[];
|
|
5
|
+
export declare function stageDrawerPinItem(locale: string, pinned: boolean, setPinned: (pinned: boolean) => void): {
|
|
6
|
+
id: string;
|
|
7
|
+
label: string;
|
|
8
|
+
icon: React.ReactSVGElement;
|
|
9
|
+
onSelect: () => void;
|
|
10
|
+
};
|
|
5
11
|
export declare function useStageDocumentFullscreen(doc?: Document): boolean;
|
|
6
12
|
export interface StageDockAction {
|
|
7
13
|
kind: 'docked' | 'opening' | 'external';
|
|
@@ -39,11 +45,12 @@ interface StageLauncherProps {
|
|
|
39
45
|
} | null;
|
|
40
46
|
};
|
|
41
47
|
drawerOpen: boolean;
|
|
48
|
+
savedDrawerSelected?: boolean;
|
|
42
49
|
editorFullscreen?: boolean;
|
|
43
50
|
focusDrawer(): void;
|
|
44
51
|
revealStage(): void;
|
|
45
52
|
}
|
|
46
|
-
export declare function StageLauncher({ locale, options, dockAction, tab, drawerOpen, editorFullscreen, focusDrawer, revealStage }: StageLauncherProps): React.DetailedReactHTMLElement<{
|
|
53
|
+
export declare function StageLauncher({ locale, options, dockAction, tab, drawerOpen, savedDrawerSelected, editorFullscreen, focusDrawer, revealStage }: StageLauncherProps): React.DetailedReactHTMLElement<{
|
|
47
54
|
className: string;
|
|
48
55
|
}, HTMLElement>;
|
|
49
56
|
export {};
|
package/dist/stage-launcher.js
CHANGED
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
import React, { createElement as element } from 'react';
|
|
2
|
+
import { drawerPinIcon } from "./drawer-views.js";
|
|
2
3
|
const labels = {
|
|
3
4
|
ja: {
|
|
4
5
|
open: 'ステージを開く',
|
|
5
6
|
menu: 'ステージの開き方',
|
|
6
7
|
window: '別ウィンドウで表示',
|
|
7
8
|
tab: 'タブで表示',
|
|
8
|
-
drawer: '引出しで表示'
|
|
9
|
+
drawer: '引出しで表示',
|
|
10
|
+
pinDrawer: '引出しを常時表示する',
|
|
11
|
+
autoHideDrawer: '引出しを自動的に隠す'
|
|
9
12
|
},
|
|
10
13
|
en: {
|
|
11
14
|
open: 'Open stage',
|
|
12
15
|
menu: 'Stage opening options',
|
|
13
16
|
window: 'Show in a separate window',
|
|
14
17
|
tab: 'Show in a tab',
|
|
15
|
-
drawer: 'Show in the drawer'
|
|
18
|
+
drawer: 'Show in the drawer',
|
|
19
|
+
pinDrawer: 'Keep the drawer open',
|
|
20
|
+
autoHideDrawer: 'Automatically hide the drawer'
|
|
16
21
|
}
|
|
17
22
|
};
|
|
18
23
|
const modes = ['window', 'tab', 'drawer'];
|
|
@@ -30,6 +35,15 @@ export function stagePresentationItems(locale, current, actions) {
|
|
|
30
35
|
strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true }, element('path', { d: icons[id] }))
|
|
31
36
|
}));
|
|
32
37
|
}
|
|
38
|
+
export function stageDrawerPinItem(locale, pinned, setPinned) {
|
|
39
|
+
const text = textFor(locale);
|
|
40
|
+
return {
|
|
41
|
+
id: 'drawer-pin',
|
|
42
|
+
label: pinned ? text.autoHideDrawer : text.pinDrawer,
|
|
43
|
+
icon: drawerPinIcon(element, !pinned),
|
|
44
|
+
onSelect: () => setPinned(!pinned)
|
|
45
|
+
};
|
|
46
|
+
}
|
|
33
47
|
export function useStageDocumentFullscreen(doc) {
|
|
34
48
|
const [fullscreenDocument, setFullscreenDocument] = React.useState();
|
|
35
49
|
React.useLayoutEffect(() => {
|
|
@@ -40,8 +54,9 @@ export function useStageDocumentFullscreen(doc) {
|
|
|
40
54
|
}, [doc]);
|
|
41
55
|
return Boolean(doc && fullscreenDocument === doc);
|
|
42
56
|
}
|
|
43
|
-
export function StageLauncher({ locale, options, dockAction, tab, drawerOpen, editorFullscreen, focusDrawer, revealStage }) {
|
|
44
|
-
const [
|
|
57
|
+
export function StageLauncher({ locale, options, dockAction, tab, drawerOpen, savedDrawerSelected, editorFullscreen, focusDrawer, revealStage }) {
|
|
58
|
+
const [localDrawerSelected, setLocalDrawerSelected] = React.useState(false);
|
|
59
|
+
const drawerSelected = savedDrawerSelected ?? localDrawerSelected;
|
|
45
60
|
const { styles, MenuButton } = options;
|
|
46
61
|
const text = textFor(locale);
|
|
47
62
|
const separate = dockAction?.kind === 'opening' || dockAction?.kind === 'external';
|
|
@@ -54,9 +69,9 @@ export function StageLauncher({ locale, options, dockAction, tab, drawerOpen, ed
|
|
|
54
69
|
};
|
|
55
70
|
const defaultTarget = drawerSelected || !available.window ? 'drawer' : 'window';
|
|
56
71
|
React.useLayoutEffect(() => {
|
|
57
|
-
if (mode && !editorFullscreen)
|
|
58
|
-
|
|
59
|
-
}, [mode, editorFullscreen]);
|
|
72
|
+
if (savedDrawerSelected === undefined && mode && !editorFullscreen)
|
|
73
|
+
setLocalDrawerSelected(mode === 'drawer');
|
|
74
|
+
}, [mode, editorFullscreen, savedDrawerSelected]);
|
|
60
75
|
function activate(target) {
|
|
61
76
|
if (disabled || !available[target])
|
|
62
77
|
return;
|
package/dist/stage-surface.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { Context, ElementType } from 'react';
|
|
|
2
2
|
import type { useDockviewStage } from './dockview-stage.ts';
|
|
3
3
|
import { type StageDockAction, type StageLauncherOptions } from './stage-launcher.ts';
|
|
4
4
|
export type { StageDockAction, StageLauncherOptions } from './stage-launcher.ts';
|
|
5
|
-
export { stagePresentationItems, useStageDocumentFullscreen } from './stage-launcher.ts';
|
|
5
|
+
export { stageDrawerPinItem, stagePresentationItems, useStageDocumentFullscreen } from './stage-launcher.ts';
|
|
6
6
|
export { StageResizeHandle } from './stage-resize-handle.ts';
|
|
7
7
|
interface StageWindowConnection<Target> {
|
|
8
8
|
ready: Promise<Target>;
|
|
@@ -21,11 +21,12 @@ export declare function stageDockActionLabel(locale: string, { drawer, detached,
|
|
|
21
21
|
detached: boolean;
|
|
22
22
|
external?: boolean;
|
|
23
23
|
}): "ステージをエディターに戻す" | "Dock stage" | "ステージを別ウィンドウで開く" | "別ウィンドウで開く" | "Open in a separate window" | "アンドック" | "Undock stage";
|
|
24
|
-
type StagePlacement = Pick<NonNullable<ReturnType<typeof useDockviewStage>>, 'surface' | 'inlineRef' | 'docked'> & Partial<Pick<NonNullable<ReturnType<typeof useDockviewStage>>, 'commands'>>;
|
|
24
|
+
type StagePlacement = Pick<NonNullable<ReturnType<typeof useDockviewStage>>, 'surface' | 'inlineRef' | 'docked'> & Partial<Pick<NonNullable<ReturnType<typeof useDockviewStage>>, 'commands' | 'drawerLayout' | 'updateDrawer' | 'resetDrawerPresentation'>>;
|
|
25
25
|
export declare function createStageSurface(React: typeof import('react'), { context, EdgeDrawer, Panel }: {
|
|
26
26
|
context: Context<{
|
|
27
27
|
locale: string;
|
|
28
28
|
stageDrawer?: boolean;
|
|
29
|
+
stageDrawerPinned?: boolean;
|
|
29
30
|
stageHidden?: boolean;
|
|
30
31
|
setStageDrawerOpen?(open: boolean): void;
|
|
31
32
|
setStageVisible?(visible: boolean): void;
|
package/dist/stage-surface.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createPortal } from 'react-dom';
|
|
2
2
|
import { createDockview, themeLight } from 'dockview';
|
|
3
3
|
import { StageLauncher } from "./stage-launcher.js";
|
|
4
|
-
export { stagePresentationItems, useStageDocumentFullscreen } from "./stage-launcher.js";
|
|
4
|
+
export { stageDrawerPinItem, stagePresentationItems, useStageDocumentFullscreen } from "./stage-launcher.js";
|
|
5
5
|
export { StageResizeHandle } from "./stage-resize-handle.js";
|
|
6
6
|
export function createStagePopoutHost(host, title) {
|
|
7
7
|
return {
|
|
@@ -84,10 +84,18 @@ export function stageDockActionLabel(locale, { drawer, detached, external }) {
|
|
|
84
84
|
}
|
|
85
85
|
export function createStageSurface(React, { context, EdgeDrawer, Panel }) {
|
|
86
86
|
return function StageSurface({ externalHost, onDockActionChange, placement, dockAction, launcher, openDrawerRef, closeDrawerRef, editorFullscreen, ...props }) {
|
|
87
|
-
const { locale, stageDrawer, stageHidden, setStageDrawerOpen, setStageVisible } = React.useContext(context);
|
|
87
|
+
const { locale, stageDrawer, stageDrawerPinned = true, stageHidden, setStageDrawerOpen, setStageVisible } = React.useContext(context);
|
|
88
88
|
const [drawerOpen, setDrawerOpen] = React.useState(false);
|
|
89
89
|
const localDrawerRef = React.useRef(null);
|
|
90
90
|
const focusDrawer = openDrawerRef ?? localDrawerRef;
|
|
91
|
+
const updateDrawer = placement?.updateDrawer;
|
|
92
|
+
const resetDrawerPresentation = placement?.resetDrawerPresentation;
|
|
93
|
+
const drawerLayout = placement?.drawerLayout;
|
|
94
|
+
const stageOutsideDrawer = Boolean(editorFullscreen || dockAction?.kind === 'external' || placement?.docked);
|
|
95
|
+
React.useLayoutEffect(() => {
|
|
96
|
+
if (stageOutsideDrawer)
|
|
97
|
+
resetDrawerPresentation?.();
|
|
98
|
+
}, [stageOutsideDrawer, resetDrawerPresentation, drawerLayout?.open, drawerLayout?.selected]);
|
|
91
99
|
const onOpenChange = React.useCallback((open) => {
|
|
92
100
|
setStageDrawerOpen?.(open);
|
|
93
101
|
setDrawerOpen(open);
|
|
@@ -111,7 +119,10 @@ export function createStageSurface(React, { context, EdgeDrawer, Panel }) {
|
|
|
111
119
|
const dock = stageDrawer ? React.createElement(EdgeDrawer, {
|
|
112
120
|
edge: 'right',
|
|
113
121
|
movableStage: true,
|
|
122
|
+
keepOpenOnBlur: stageDrawerPinned,
|
|
114
123
|
available: !placement?.docked && (!dockAction || dockAction.kind === 'docked'),
|
|
124
|
+
stageDrawerLayout: drawerLayout,
|
|
125
|
+
updateStageDrawer: updateDrawer,
|
|
115
126
|
label: japanese ? 'ステージを展開' : 'Reveal stage',
|
|
116
127
|
onOpenChange,
|
|
117
128
|
focusPanelRef: launcher ? focusDrawer : undefined,
|
|
@@ -126,6 +137,7 @@ export function createStageSurface(React, { context, EdgeDrawer, Panel }) {
|
|
|
126
137
|
locale, options: launcher, dockAction,
|
|
127
138
|
tab: placement?.commands ? { docked: placement.docked, commands: placement.commands } : undefined,
|
|
128
139
|
drawerOpen: stageDrawer && drawerOpen && !stageHidden,
|
|
140
|
+
savedDrawerSelected: updateDrawer ? Boolean(drawerLayout?.selected) : undefined,
|
|
129
141
|
editorFullscreen,
|
|
130
142
|
focusDrawer: () => focusDrawer.current?.(),
|
|
131
143
|
revealStage: () => { if (stageHidden)
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { DrawerViews } from './drawer-views.ts';
|
|
2
|
+
import type { StageDrawerLayout } from './workspace-layout.ts';
|
|
2
3
|
export type { DrawerMenu, DrawerMenuRenderProps, DrawerRenderProps, DrawerView, DrawerViewId, DrawerViews, HostDrawerViewId } from './drawer-views.ts';
|
|
3
4
|
export declare function createStandardLayout(React: any, { styles, targetStyles, context, LayoutMenu }: {
|
|
4
5
|
styles: any;
|
|
@@ -6,7 +7,7 @@ export declare function createStandardLayout(React: any, { styles, targetStyles,
|
|
|
6
7
|
context: any;
|
|
7
8
|
LayoutMenu: any;
|
|
8
9
|
}): {
|
|
9
|
-
StandardLayout: ({ enabled, splitter, windowLayout, stageActionEnabled, stageDrawer, onPaletteModeChange, windowTools, Container, render, drawerViews, ...props }: {
|
|
10
|
+
StandardLayout: ({ enabled, splitter, windowLayout, stageActionEnabled, stageDrawer, onPaletteModeChange, windowTools, Container, render, drawerViews, stageDrawerLayout, updateStageDrawer, ...props }: {
|
|
10
11
|
[x: string]: any;
|
|
11
12
|
enabled: any;
|
|
12
13
|
splitter: any;
|
|
@@ -18,8 +19,10 @@ export declare function createStandardLayout(React: any, { styles, targetStyles,
|
|
|
18
19
|
Container: any;
|
|
19
20
|
render: any;
|
|
20
21
|
drawerViews?: DrawerViews;
|
|
22
|
+
stageDrawerLayout?: StageDrawerLayout;
|
|
23
|
+
updateStageDrawer?: (patch: Partial<StageDrawerLayout>) => void;
|
|
21
24
|
}) => any;
|
|
22
|
-
EdgeDrawer: ({ edge, label, pinned, onOpenChange, portalContent, holdOpenSelector, focusPanelRef, closePanelRef, focusBoundary, showTrigger, movableStage, available, children }: {
|
|
25
|
+
EdgeDrawer: ({ edge, label, pinned, onOpenChange, portalContent, holdOpenSelector, focusPanelRef, closePanelRef, focusBoundary, showTrigger, movableStage, available, keepOpenOnBlur, stageDrawerLayout, updateStageDrawer, children }: {
|
|
23
26
|
edge: any;
|
|
24
27
|
label: any;
|
|
25
28
|
pinned?: boolean;
|
|
@@ -32,6 +35,9 @@ export declare function createStandardLayout(React: any, { styles, targetStyles,
|
|
|
32
35
|
showTrigger?: boolean;
|
|
33
36
|
movableStage?: boolean;
|
|
34
37
|
available?: boolean;
|
|
38
|
+
keepOpenOnBlur?: boolean;
|
|
39
|
+
stageDrawerLayout?: StageDrawerLayout;
|
|
40
|
+
updateStageDrawer?: (patch: Partial<StageDrawerLayout>) => void;
|
|
35
41
|
children: any;
|
|
36
42
|
}) => any;
|
|
37
43
|
TargetLayout: ({ compact, render }: {
|