@kubohiroya/turbowarp-plus-editor-workbench 0.7.0 → 0.8.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.
@@ -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
  };
@@ -12,6 +12,24 @@ 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.position === previous?.position && next.width === previous?.width)
27
+ return;
28
+ restoreDrawer(next.open || next.selected || next.position || next.width ? next : undefined);
29
+ for (const listener of drawerListeners)
30
+ listener();
31
+ }, [drawerListeners, restoreDrawer]);
32
+ const resetDrawerPresentation = React.useCallback(() => updateDrawer({ open: false, selected: false }), [updateDrawer]);
15
33
  const move = React.useCallback(() => {
16
34
  const destination = suspended.current ? inline.current : dock.current ?? inline.current;
17
35
  if (surface && destination && surface.parentElement !== destination)
@@ -35,10 +53,18 @@ export function useDockviewStage(enabled, locale) {
35
53
  move();
36
54
  setDocked(Boolean(destination));
37
55
  },
38
- connect: setCommands
39
- }), [japanese, move]);
56
+ connect: setCommands,
57
+ drawer: {
58
+ read: () => savedDrawer.current,
59
+ restore: restoreDrawer,
60
+ subscribe(listener) {
61
+ drawerListeners.add(listener);
62
+ return () => { drawerListeners.delete(listener); };
63
+ }
64
+ }
65
+ }), [japanese, move, restoreDrawer, drawerListeners]);
40
66
  return surface && {
41
- surface, pane, docked, commands, inlineRef, suspend,
67
+ surface, pane, docked, commands, inlineRef, suspend, drawerLayout, updateDrawer, resetDrawerPresentation,
42
68
  openLabel: japanese ? 'ステージをタブで開く' : 'Open stage in workspace',
43
69
  closeLabel: japanese ? 'ステージを元の位置に戻す' : 'Return stage from workspace'
44
70
  };
@@ -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 panels and splits of a layout, without sizes or selection, to tell whether the user changed it. */
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
- export declare function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, editor: HTMLElement, focus: () => void): () => void;
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
- return () => {
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
  }
@@ -39,11 +39,12 @@ interface StageLauncherProps {
39
39
  } | null;
40
40
  };
41
41
  drawerOpen: boolean;
42
+ savedDrawerSelected?: boolean;
42
43
  editorFullscreen?: boolean;
43
44
  focusDrawer(): void;
44
45
  revealStage(): void;
45
46
  }
46
- export declare function StageLauncher({ locale, options, dockAction, tab, drawerOpen, editorFullscreen, focusDrawer, revealStage }: StageLauncherProps): React.DetailedReactHTMLElement<{
47
+ export declare function StageLauncher({ locale, options, dockAction, tab, drawerOpen, savedDrawerSelected, editorFullscreen, focusDrawer, revealStage }: StageLauncherProps): React.DetailedReactHTMLElement<{
47
48
  className: string;
48
49
  }, HTMLElement>;
49
50
  export {};
@@ -40,8 +40,9 @@ export function useStageDocumentFullscreen(doc) {
40
40
  }, [doc]);
41
41
  return Boolean(doc && fullscreenDocument === doc);
42
42
  }
43
- export function StageLauncher({ locale, options, dockAction, tab, drawerOpen, editorFullscreen, focusDrawer, revealStage }) {
44
- const [drawerSelected, setDrawerSelected] = React.useState(false);
43
+ export function StageLauncher({ locale, options, dockAction, tab, drawerOpen, savedDrawerSelected, editorFullscreen, focusDrawer, revealStage }) {
44
+ const [localDrawerSelected, setLocalDrawerSelected] = React.useState(false);
45
+ const drawerSelected = savedDrawerSelected ?? localDrawerSelected;
45
46
  const { styles, MenuButton } = options;
46
47
  const text = textFor(locale);
47
48
  const separate = dockAction?.kind === 'opening' || dockAction?.kind === 'external';
@@ -54,9 +55,9 @@ export function StageLauncher({ locale, options, dockAction, tab, drawerOpen, ed
54
55
  };
55
56
  const defaultTarget = drawerSelected || !available.window ? 'drawer' : 'window';
56
57
  React.useLayoutEffect(() => {
57
- if (mode && !editorFullscreen)
58
- setDrawerSelected(mode === 'drawer');
59
- }, [mode, editorFullscreen]);
58
+ if (savedDrawerSelected === undefined && mode && !editorFullscreen)
59
+ setLocalDrawerSelected(mode === 'drawer');
60
+ }, [mode, editorFullscreen, savedDrawerSelected]);
60
61
  function activate(target) {
61
62
  if (disabled || !available[target])
62
63
  return;
@@ -21,7 +21,7 @@ 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;
@@ -88,6 +88,14 @@ export function createStageSurface(React, { context, EdgeDrawer, Panel }) {
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);
@@ -112,6 +120,8 @@ export function createStageSurface(React, { context, EdgeDrawer, Panel }) {
112
120
  edge: 'right',
113
121
  movableStage: true,
114
122
  available: !placement?.docked && (!dockAction || dockAction.kind === 'docked'),
123
+ stageDrawerLayout: drawerLayout,
124
+ updateStageDrawer: updateDrawer,
115
125
  label: japanese ? 'ステージを展開' : 'Reveal stage',
116
126
  onOpenChange,
117
127
  focusPanelRef: launcher ? focusDrawer : undefined,
@@ -126,6 +136,7 @@ export function createStageSurface(React, { context, EdgeDrawer, Panel }) {
126
136
  locale, options: launcher, dockAction,
127
137
  tab: placement?.commands ? { docked: placement.docked, commands: placement.commands } : undefined,
128
138
  drawerOpen: stageDrawer && drawerOpen && !stageHidden,
139
+ savedDrawerSelected: updateDrawer ? Boolean(drawerLayout?.selected) : undefined,
129
140
  editorFullscreen,
130
141
  focusDrawer: () => focusDrawer.current?.(),
131
142
  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, stageDrawerLayout, updateStageDrawer, children }: {
23
26
  edge: any;
24
27
  label: any;
25
28
  pinned?: boolean;
@@ -32,6 +35,8 @@ export declare function createStandardLayout(React: any, { styles, targetStyles,
32
35
  showTrigger?: boolean;
33
36
  movableStage?: boolean;
34
37
  available?: boolean;
38
+ stageDrawerLayout?: StageDrawerLayout;
39
+ updateStageDrawer?: (patch: Partial<StageDrawerLayout>) => void;
35
40
  children: any;
36
41
  }) => any;
37
42
  TargetLayout: ({ compact, render }: {
@@ -16,7 +16,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
16
16
  const DrawerViewBar = createDrawerViewBar(React, styles);
17
17
  const targetSearch = React.createContext('');
18
18
  const targetTools = React.createContext(null);
19
- function StandardLayout({ enabled, splitter, windowLayout, stageActionEnabled, stageDrawer = false, onPaletteModeChange, windowTools, Container, render, drawerViews = undefined, ...props }) {
19
+ function StandardLayout({ enabled, splitter, windowLayout, stageActionEnabled, stageDrawer = false, onPaletteModeChange, windowTools, Container, render, drawerViews = undefined, stageDrawerLayout = undefined, updateStageDrawer = undefined, ...props }) {
20
20
  const [showUndock, setShowUndock] = useState(false);
21
21
  const [targetsPinned, setTargetsPinned] = useState(true);
22
22
  const [showStage, setShowStage] = useState(true);
@@ -67,9 +67,12 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
67
67
  const maximumStageWidth = Math.max(1, Math.floor(Math.min(editorSpace - 24, stageDrawer ? (size?.viewportWidth ?? bodyWidth) - 12 : Infinity, ((size?.height ?? 640) - 112) * props.stageAspect)));
68
68
  const defaultStageWidth = Math.min(maximumStageWidth, Math.floor(Math.min(props.defaultStageWidth, 360, bodyWidth / 2)));
69
69
  const minimumStageWidth = Math.min(defaultStageWidth, 280);
70
- const stageWidth = Math.max(minimumStageWidth, Math.min(maximumStageWidth, preferredStageWidth ?? defaultStageWidth));
70
+ const preferredWidth = stageDrawer && updateStageDrawer ? stageDrawerLayout?.width : preferredStageWidth;
71
+ const resizeStage = stageDrawer && updateStageDrawer ?
72
+ (width) => updateStageDrawer({ width }) : setPreferredStageWidth;
73
+ const stageWidth = Math.max(minimumStageWidth, Math.min(maximumStageWidth, preferredWidth ?? defaultStageWidth));
71
74
  const stageResize = plusLayout && maximumStageWidth > minimumStageWidth ?
72
- { minimum: minimumStageWidth, maximum: maximumStageWidth, resize: setPreferredStageWidth } : null;
75
+ { minimum: minimumStageWidth, maximum: maximumStageWidth, resize: resizeStage } : null;
73
76
  useLayoutEffect(() => {
74
77
  if (enabled)
75
78
  onPaletteModeChange?.(true);
@@ -147,7 +150,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
147
150
  targetClassName: targetsPinned ? styles.standardTargets :
148
151
  `${styles.standardTargets} ${styles.retractedTargets}`,
149
152
  stageDisplayWidth: stageWidth,
150
- handleStagePreset: () => setPreferredStageWidth(null),
153
+ handleStagePreset: () => resizeStage(undefined),
151
154
  editorWidth: targetsPinned && resizable ? targetSplit.second : size?.width
152
155
  };
153
156
  };
@@ -172,22 +175,32 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
172
175
  drawerViews, drawerView, selectDrawerView
173
176
  } }, Container ? element(Container, { locale: props.locale }, layout) : layout);
174
177
  }
175
- function EdgeDrawer({ edge, label, pinned = false, onOpenChange, portalContent = false, holdOpenSelector = '', focusPanelRef = undefined, closePanelRef = undefined, focusBoundary = undefined, showTrigger = true, movableStage = false, available = true, children }) {
178
+ function EdgeDrawer({ edge, label, pinned = false, onOpenChange, portalContent = false, holdOpenSelector = '', focusPanelRef = undefined, closePanelRef = undefined, focusBoundary = undefined, showTrigger = true, movableStage = false, available = true, stageDrawerLayout = undefined, updateStageDrawer = undefined, children }) {
176
179
  const [hovered, setHovered] = useState(false);
177
- const [engaged, setEngaged] = useState(false);
180
+ const [localEngaged, setLocalEngaged] = useState(false);
178
181
  const [heldOpen, setHeldOpen] = useState(false);
179
182
  const drawer = useRef(null);
180
183
  const trigger = useRef(null);
181
184
  const panel = useRef(null);
182
185
  const opened = useRef(false);
183
- const open = available && (pinned || hovered || engaged || heldOpen);
184
- const stageTrigger = movableStage && available && (showTrigger || opened.current);
186
+ const stageDrag = useRef(null);
187
+ const engaged = updateStageDrawer ? Boolean(stageDrawerLayout?.open) : localEngaged;
188
+ const setEngaged = React.useCallback((engaged) => {
189
+ if (updateStageDrawer)
190
+ updateStageDrawer({ open: engaged, ...(engaged && { selected: true }) });
191
+ else
192
+ setLocalEngaged(engaged);
193
+ }, [updateStageDrawer]);
194
+ const selected = updateStageDrawer ? Boolean(stageDrawerLayout?.selected) : opened.current;
195
+ const open = available && (pinned || engaged || heldOpen ||
196
+ (hovered && (!updateStageDrawer || showTrigger || selected)));
197
+ const stageTrigger = movableStage && available && (showTrigger || selected);
185
198
  useLayoutEffect(() => {
186
199
  if (open)
187
200
  opened.current = true;
188
201
  if (!available) {
189
202
  setHovered(false);
190
- setEngaged(false);
203
+ setLocalEngaged(false);
191
204
  }
192
205
  }, [open, available]);
193
206
  useLayoutEffect(() => {
@@ -198,8 +211,16 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
198
211
  const editor = stage?.closest(`.${styles.standardBody}`);
199
212
  if (!editor || !node.ownerDocument.defaultView?.ResizeObserver)
200
213
  return;
201
- return attachStageDrawerDrag(node, stage, editor, () => panel.current.focus({ preventScroll: true }));
202
- }, [movableStage]);
214
+ const controller = attachStageDrawerDrag(node, stage, editor, () => panel.current.focus({ preventScroll: true }), (position) => updateStageDrawer?.({ position }));
215
+ stageDrag.current = controller;
216
+ return () => {
217
+ stageDrag.current = null;
218
+ controller.dispose();
219
+ };
220
+ }, [movableStage, updateStageDrawer]);
221
+ useLayoutEffect(() => {
222
+ stageDrag.current?.setPosition(stageDrawerLayout?.position);
223
+ }, [movableStage, stageDrawerLayout?.position, updateStageDrawer]);
203
224
  useLayoutEffect(() => {
204
225
  if (!holdOpenSelector)
205
226
  return;
@@ -255,7 +276,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
255
276
  return;
256
277
  focusPanelRef.current = focusPanel;
257
278
  return () => { focusPanelRef.current = null; };
258
- }, [focusPanelRef, available]);
279
+ }, [focusPanelRef, available, setEngaged]);
259
280
  const closePanel = React.useCallback(() => {
260
281
  setHovered(false);
261
282
  setEngaged(false);
@@ -265,7 +286,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
265
286
  }
266
287
  else
267
288
  button?.focus({ preventScroll: true });
268
- }, [focusBoundary, showTrigger]);
289
+ }, [focusBoundary, showTrigger, setEngaged]);
269
290
  useLayoutEffect(() => {
270
291
  if (!closePanelRef || !open)
271
292
  return;
@@ -284,7 +305,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
284
305
  return;
285
306
  focusBoundary.addEventListener('focusout', blur);
286
307
  return () => focusBoundary.removeEventListener('focusout', blur);
287
- }, [focusBoundary]);
308
+ }, [focusBoundary, setEngaged]);
288
309
  useLayoutEffect(() => {
289
310
  if (!portalContent)
290
311
  return;
@@ -300,7 +321,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
300
321
  node.removeEventListener('focusin', focus);
301
322
  node.removeEventListener('focusout', blur);
302
323
  };
303
- }, [portalContent, focusBoundary, open, showTrigger, movableStage]);
324
+ }, [portalContent, focusBoundary, open, showTrigger, movableStage, setEngaged]);
304
325
  useLayoutEffect(() => {
305
326
  if (!portalContent || !movableStage || !open)
306
327
  return;
@@ -23,6 +23,18 @@ export interface SavedPopout {
23
23
  panels: string[];
24
24
  position?: WindowPosition;
25
25
  }
26
+ /** Coordinates along the drawer's available travel, with at least one axis at an edge. */
27
+ export interface StageDrawerPosition {
28
+ x: number;
29
+ y: number;
30
+ }
31
+ export interface StageDrawerLayout {
32
+ open: boolean;
33
+ /** Keep the drawer selected after it folds into the edge. */
34
+ selected: boolean;
35
+ position?: StageDrawerPosition;
36
+ width?: number;
37
+ }
26
38
  export interface WorkspaceLayout {
27
39
  version: 1;
28
40
  project: string;
@@ -30,6 +42,7 @@ export interface WorkspaceLayout {
30
42
  activeGroup: string;
31
43
  editingView?: string;
32
44
  panels: Record<string, PanelReference>;
45
+ stageDrawer?: StageDrawerLayout;
33
46
  /** Separate windows are restored docked; the user reopens each one. */
34
47
  popouts?: SavedPopout[];
35
48
  }
@@ -189,10 +189,26 @@ export function readWorkspaceLayout(raw, project) {
189
189
  const popouts = readPopouts(input.popouts, panels);
190
190
  if (!popouts)
191
191
  return;
192
+ const stageDrawer = readStageDrawer(input.stageDrawer);
192
193
  return { version: 1, project: input.project, grid: { root, width, height, orientation }, activeGroup: input.activeGroup,
193
194
  editingView: typeof editingView === 'string' ? editingView : undefined, panels,
195
+ ...(stageDrawer && { stageDrawer }),
194
196
  ...(popouts.length && { popouts }) };
195
197
  }
198
+ function readStageDrawer(input) {
199
+ if (!record(input) || typeof input.open !== 'boolean' || typeof input.selected !== 'boolean')
200
+ return;
201
+ const { position, width } = input;
202
+ const fraction = (value) => size(value) && value <= 1;
203
+ const edge = (value) => value === 0 || value === 1;
204
+ return {
205
+ open: input.open,
206
+ selected: input.open || input.selected,
207
+ ...(size(width) && width > 0 && { width }),
208
+ ...(record(position) && fraction(position.x) && fraction(position.y) &&
209
+ (edge(position.x) || edge(position.y)) && { position: { x: position.x, y: position.y } })
210
+ };
211
+ }
196
212
  function readPopouts(input, panels) {
197
213
  if (input === undefined)
198
214
  return [];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kubohiroya/turbowarp-plus-editor-workbench",
3
- "version": "0.7.0",
3
+ "version": "0.8.0",
4
4
  "description": "The TurboWarp Plus Editor workbench: layout, dockable sprite tabs, stage, debugger tab and file menu",
5
5
  "type": "module",
6
6
  "license": "MPL-2.0",
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import type {StageDrawerLayout} from './workspace-layout.ts';
2
3
 
3
4
  type StageCommands = {open(): void; close(): void};
4
5
 
@@ -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
 
11
17
  export function useDockviewStage(enabled: boolean, locale: string) {
@@ -20,6 +26,23 @@ export function useDockviewStage(enabled: boolean, locale: string) {
20
26
  const suspended = React.useRef(false);
21
27
  const [docked, setDocked] = React.useState(false);
22
28
  const [commands, setCommands] = React.useState<StageCommands>(null);
29
+ const [drawerLayout, setDrawerLayout] = React.useState<StageDrawerLayout>();
30
+ const savedDrawer = React.useRef<StageDrawerLayout>();
31
+ const drawerListeners = React.useMemo(() => new Set<() => void>(), []);
32
+ const restoreDrawer = React.useCallback((layout?: StageDrawerLayout) => {
33
+ savedDrawer.current = layout;
34
+ setDrawerLayout(layout);
35
+ }, []);
36
+ const updateDrawer = React.useCallback((patch: Partial<StageDrawerLayout>) => {
37
+ const previous = savedDrawer.current;
38
+ const next = {open: false, selected: false, ...previous, ...patch};
39
+ if (next.open === Boolean(previous?.open) && next.selected === Boolean(previous?.selected) &&
40
+ next.position === previous?.position && next.width === previous?.width) return;
41
+ restoreDrawer(next.open || next.selected || next.position || next.width ? next : undefined);
42
+ for (const listener of drawerListeners) listener();
43
+ }, [drawerListeners, restoreDrawer]);
44
+ const resetDrawerPresentation = React.useCallback(() => updateDrawer({open: false, selected: false}),
45
+ [updateDrawer]);
23
46
 
24
47
  const move = React.useCallback(() => {
25
48
  const destination = suspended.current ? inline.current : dock.current ?? inline.current;
@@ -43,10 +66,18 @@ export function useDockviewStage(enabled: boolean, locale: string) {
43
66
  move();
44
67
  setDocked(Boolean(destination));
45
68
  },
46
- connect: setCommands
47
- }), [japanese, move]);
69
+ connect: setCommands,
70
+ drawer: {
71
+ read: () => savedDrawer.current,
72
+ restore: restoreDrawer,
73
+ subscribe(listener) {
74
+ drawerListeners.add(listener);
75
+ return () => {drawerListeners.delete(listener);};
76
+ }
77
+ }
78
+ }), [japanese, move, restoreDrawer, drawerListeners]);
48
79
  return surface && {
49
- surface, pane, docked, commands, inlineRef, suspend,
80
+ surface, pane, docked, commands, inlineRef, suspend, drawerLayout, updateDrawer, resetDrawerPresentation,
50
81
  openLabel: japanese ? 'ステージをタブで開く' : 'Open stage in workspace',
51
82
  closeLabel: japanese ? 'ステージを元の位置に戻す' : 'Return stage from workspace'
52
83
  };
@@ -287,6 +287,7 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
287
287
  const window = document.defaultView;
288
288
  const documentWorkspace = multiView && getDocumentWorkspace(vm);
289
289
  let pendingRestore = Boolean(persistence);
290
+ let drawerEditedDuringRestore = false;
290
291
  let restoreFrame: number | undefined;
291
292
  let restoreTimeout: number | undefined;
292
293
  let saveFrame: number | undefined;
@@ -918,8 +919,9 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
918
919
  .map(popout => ({...popout, panels: popout.panels.filter(id =>
919
920
  reopenable.get(id) === popout && views.has(id) && panels[id]?.kind === 'sprite')}))
920
921
  .filter(popout => popout.panels.length);
922
+ const stageDrawer = stagePane?.drawer?.read();
921
923
  return {version: 1, project: projectSignature(targets), ...saved,
922
- editingView: active?.id, panels, ...(popouts.length && {popouts})};
924
+ editingView: active?.id, panels, ...(stageDrawer && {stageDrawer}), ...(popouts.length && {popouts})};
923
925
  }
924
926
 
925
927
  function writeLayout() {
@@ -991,17 +993,21 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
991
993
  pendingRestore = false;
992
994
  window.clearTimeout(restoreTimeout);
993
995
  restoreTimeout = undefined;
996
+ if (drawerEditedDuringRestore) {
997
+ drawerEditedDuringRestore = false;
998
+ scheduleSave();
999
+ }
994
1000
  updateLayoutState();
995
1001
  }
996
1002
 
997
- /** The panels and splits of a layout, without sizes or selection, to tell whether the user changed it. */
1003
+ /** The tab arrangement and drawer state used to detect a change from the initial layout. */
998
1004
  function layoutShape(layout: WorkspaceLayout) {
999
1005
  type Node = WorkspaceLayout['grid']['root'];
1000
1006
  const reference = (id: string) => layout.panels[id] ?? null;
1001
1007
  const shape = (node: Node): unknown => Array.isArray(node.data) ? node.data.map(shape) :
1002
1008
  node.data.views.map(reference);
1003
1009
  return JSON.stringify([layout.grid.orientation, shape(layout.grid.root),
1004
- (layout.popouts ?? []).map(popout => popout.panels.map(reference))]);
1010
+ (layout.popouts ?? []).map(popout => popout.panels.map(reference)), layout.stageDrawer]);
1005
1011
  }
1006
1012
 
1007
1013
  function identifyProject(): WorkspaceProjectIdentity {
@@ -1029,7 +1035,7 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1029
1035
  /** Keep the layout the project opened with, so leaving it unchanged adds no record. */
1030
1036
  function keepInitialLayout() {
1031
1037
  const layout = captureLayout();
1032
- initialShape = layout && layoutShape(layout);
1038
+ initialShape = layout && layoutShape({...layout, stageDrawer: undefined});
1033
1039
  finishRestore();
1034
1040
  }
1035
1041
 
@@ -1040,7 +1046,13 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1040
1046
  if (!targets.length || !vm.editingTarget) return;
1041
1047
  const signature = projectSignature(targets);
1042
1048
  if (!layoutSession) return openLayoutSession(signature);
1043
- if (!pendingRestore) return;
1049
+ if (!pendingRestore) {
1050
+ if (drawerEditedDuringRestore) {
1051
+ drawerEditedDuringRestore = false;
1052
+ scheduleSave();
1053
+ }
1054
+ return;
1055
+ }
1044
1056
  reopenable.clear();
1045
1057
  // A project found by its file, folder or desktop key keeps its tabs even after its sprites were renamed.
1046
1058
  const exact = layoutSession.exact;
@@ -1089,6 +1101,7 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1089
1101
  assignTabNumbers(resolvedSprites.values(), new Set([...targets.map(baseTitle),
1090
1102
  ...Object.values(panels).map(panel => panel.title)]));
1091
1103
  for (const [id, view] of resolvedSprites) panels[id].title = tabTitle(view);
1104
+ const restoreDrawer = !drawerEditedDuringRestore;
1092
1105
  finishRestore();
1093
1106
  syncing = true;
1094
1107
  try {
@@ -1099,6 +1112,11 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1099
1112
  for (const [id, view] of resolvedSprites) views.set(id, view);
1100
1113
  for (const [id, request] of resolvedDocuments) documents.set(id, {request});
1101
1114
  dockview.fromJSON({grid: kept.grid, activeGroup: kept.activeGroup, panels});
1115
+ if (restoreDrawer) {
1116
+ const drawer = stored.stageDrawer;
1117
+ stagePane?.drawer?.restore(drawer && dockview.getPanel(stagePanelId) ?
1118
+ {...drawer, open: false, selected: false} : drawer);
1119
+ }
1102
1120
  for (const popout of stored.popouts ?? []) {
1103
1121
  for (const id of popout.panels) if (views.has(id)) reopenable.set(id, popout);
1104
1122
  }
@@ -1131,6 +1149,8 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1131
1149
  layoutSession = undefined;
1132
1150
  initialShape = undefined;
1133
1151
  pendingRestore = true;
1152
+ drawerEditedDuringRestore = false;
1153
+ stagePane?.drawer?.restore();
1134
1154
  if (saveFrame !== undefined) window.cancelAnimationFrame(saveFrame);
1135
1155
  saveFrame = undefined;
1136
1156
  window.clearTimeout(restoreTimeout);
@@ -1219,6 +1239,10 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1219
1239
  const unsubscribeDocuments = persistence && documentWorkspace && documentWorkspace.subscribe(scheduleRestore);
1220
1240
  projectLoading = Boolean(persistence && persistence.isProjectLoading?.());
1221
1241
  const unsubscribeProject = persistence && persistence.subscribeProject?.(projectChanged);
1242
+ const unsubscribeDrawer = persistence && stagePane?.drawer?.subscribe(() => {
1243
+ if (pendingRestore || !layoutSession) drawerEditedDuringRestore = true;
1244
+ scheduleSave();
1245
+ });
1222
1246
  layoutStore?.readTabsPosition().then(position => {
1223
1247
  if (!disposed && !tabsChosen && position === 'left') setVerticalTabs(true, false);
1224
1248
  }, () => undefined).finally(() => {
@@ -1254,6 +1278,7 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
1254
1278
  if (persistence) window.removeEventListener('pagehide', flushLayout);
1255
1279
  if (unsubscribeDocuments) unsubscribeDocuments();
1256
1280
  if (unsubscribeProject) unsubscribeProject();
1281
+ if (unsubscribeDrawer) unsubscribeDrawer();
1257
1282
  if (disconnectDocuments) disconnectDocuments();
1258
1283
  root.removeEventListener('click', guardDocumentClose, true);
1259
1284
  root.removeEventListener('keydown', guardDocumentClose, true);
@@ -1,16 +1,17 @@
1
+ import type {StageDrawerPosition} from './workspace-layout.ts';
2
+
1
3
  const controls = 'button, input, select, textarea, label, a[href], img, ' +
2
4
  '[role="button"], [role="slider"], [role="menu"], [tabindex], [contenteditable]';
3
5
 
4
- type Position = {x: number; y: number};
5
-
6
6
  const clamp = (value: number) => Math.max(0, Math.min(1, value));
7
7
 
8
- export function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, editor: HTMLElement, focus: () => void) {
8
+ export function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, editor: HTMLElement, focus: () => void,
9
+ onPositionChange: (position: StageDrawerPosition) => void) {
9
10
  const document = drawer.ownerDocument;
10
11
  const view = document.defaultView;
11
- let position: Position | undefined;
12
+ let position: StageDrawerPosition | undefined;
12
13
  let drag: {id: number; x: number; y: number; offsetX: number; offsetY: number; moved: boolean} | undefined;
13
- let resizeDrag: {id: number; edge: string; start: DOMRect; position?: Position} | undefined;
14
+ let resizeDrag: {id: number; edge: string; start: DOMRect; position?: StageDrawerPosition} | undefined;
14
15
 
15
16
  function bounds() {
16
17
  const area = editor.getBoundingClientRect();
@@ -93,10 +94,23 @@ export function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, e
93
94
  if (resizeDrag?.id === event.pointerId) {
94
95
  place();
95
96
  resizeDrag = undefined;
97
+ if (position) onPositionChange({...position});
96
98
  }
97
99
  if (drag?.id !== event.pointerId) return;
100
+ const moved = drag.moved;
98
101
  drag = undefined;
99
102
  stage.removeAttribute('data-stage-drawer-dragging');
103
+ if (moved && position) onPositionChange({...position});
104
+ }
105
+
106
+ function setPosition(next?: StageDrawerPosition) {
107
+ position = next && {...next};
108
+ if (!position) {
109
+ stage.removeAttribute('data-stage-drawer-positioned');
110
+ stage.style.removeProperty('--plus-stage-drawer-x');
111
+ stage.style.removeProperty('--plus-stage-drawer-y');
112
+ }
113
+ place();
100
114
  }
101
115
 
102
116
  const handlers = {pointerdown: start, pointermove: move, pointerup: finish,
@@ -108,7 +122,7 @@ export function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, e
108
122
  observer.observe(stage);
109
123
  view.addEventListener('resize', resize);
110
124
  place();
111
- return () => {
125
+ function dispose() {
112
126
  for (const [name, handler] of Object.entries(handlers)) drawer.removeEventListener(name, handler);
113
127
  if (drag && drawer.hasPointerCapture(drag.id)) drawer.releasePointerCapture(drag.id);
114
128
  observer.disconnect();
@@ -119,5 +133,6 @@ export function attachStageDrawerDrag(drawer: HTMLElement, stage: HTMLElement, e
119
133
  stage.removeAttribute('data-stage-drawer-edge');
120
134
  stage.style.removeProperty('--plus-stage-drawer-x');
121
135
  stage.style.removeProperty('--plus-stage-drawer-y');
122
- };
136
+ }
137
+ return {setPosition, dispose};
123
138
  }
@@ -75,13 +75,16 @@ interface StageLauncherProps {
75
75
  dockAction?: StageDockAction;
76
76
  tab?: {docked: boolean; commands: {open(): void} | null};
77
77
  drawerOpen: boolean;
78
+ savedDrawerSelected?: boolean;
78
79
  editorFullscreen?: boolean;
79
80
  focusDrawer(): void;
80
81
  revealStage(): void;
81
82
  }
82
83
 
83
- export function StageLauncher({locale, options, dockAction, tab, drawerOpen, editorFullscreen, focusDrawer, revealStage}: StageLauncherProps) {
84
- const [drawerSelected, setDrawerSelected] = React.useState(false);
84
+ export function StageLauncher({locale, options, dockAction, tab, drawerOpen, savedDrawerSelected, editorFullscreen,
85
+ focusDrawer, revealStage}: StageLauncherProps) {
86
+ const [localDrawerSelected, setLocalDrawerSelected] = React.useState(false);
87
+ const drawerSelected = savedDrawerSelected ?? localDrawerSelected;
85
88
  const {styles, MenuButton} = options;
86
89
  const text = textFor(locale);
87
90
  const separate = dockAction?.kind === 'opening' || dockAction?.kind === 'external';
@@ -95,8 +98,8 @@ export function StageLauncher({locale, options, dockAction, tab, drawerOpen, edi
95
98
  const defaultTarget = drawerSelected || !available.window ? 'drawer' : 'window';
96
99
 
97
100
  React.useLayoutEffect(() => {
98
- if (mode && !editorFullscreen) setDrawerSelected(mode === 'drawer');
99
- }, [mode, editorFullscreen]);
101
+ if (savedDrawerSelected === undefined && mode && !editorFullscreen) setLocalDrawerSelected(mode === 'drawer');
102
+ }, [mode, editorFullscreen, savedDrawerSelected]);
100
103
 
101
104
  function activate(target: StageMode) {
102
105
  if (disabled || !available[target]) return;
@@ -103,7 +103,8 @@ export function stageDockActionLabel(locale: string, {drawer, detached, external
103
103
  }
104
104
 
105
105
  type StagePlacement = Pick<NonNullable<ReturnType<typeof useDockviewStage>>, 'surface' | 'inlineRef' | 'docked'> &
106
- Partial<Pick<NonNullable<ReturnType<typeof useDockviewStage>>, 'commands'>>;
106
+ Partial<Pick<NonNullable<ReturnType<typeof useDockviewStage>>,
107
+ 'commands' | 'drawerLayout' | 'updateDrawer' | 'resetDrawerPresentation'>>;
107
108
 
108
109
  export function createStageSurface(React: typeof import('react'), {
109
110
  context, EdgeDrawer, Panel
@@ -132,6 +133,13 @@ export function createStageSurface(React: typeof import('react'), {
132
133
  const [drawerOpen, setDrawerOpen] = React.useState(false);
133
134
  const localDrawerRef = React.useRef<() => void>(null);
134
135
  const focusDrawer = openDrawerRef ?? localDrawerRef;
136
+ const updateDrawer = placement?.updateDrawer;
137
+ const resetDrawerPresentation = placement?.resetDrawerPresentation;
138
+ const drawerLayout = placement?.drawerLayout;
139
+ const stageOutsideDrawer = Boolean(editorFullscreen || dockAction?.kind === 'external' || placement?.docked);
140
+ React.useLayoutEffect(() => {
141
+ if (stageOutsideDrawer) resetDrawerPresentation?.();
142
+ }, [stageOutsideDrawer, resetDrawerPresentation, drawerLayout?.open, drawerLayout?.selected]);
135
143
  const onOpenChange = React.useCallback((open: boolean) => {
136
144
  setStageDrawerOpen?.(open);
137
145
  setDrawerOpen(open);
@@ -156,6 +164,8 @@ export function createStageSurface(React: typeof import('react'), {
156
164
  edge: 'right',
157
165
  movableStage: true,
158
166
  available: !placement?.docked && (!dockAction || dockAction.kind === 'docked'),
167
+ stageDrawerLayout: drawerLayout,
168
+ updateStageDrawer: updateDrawer,
159
169
  label: japanese ? 'ステージを展開' : 'Reveal stage',
160
170
  onOpenChange,
161
171
  focusPanelRef: launcher ? focusDrawer : undefined,
@@ -170,6 +180,7 @@ export function createStageSurface(React: typeof import('react'), {
170
180
  locale, options: launcher, dockAction,
171
181
  tab: placement?.commands ? {docked: placement.docked, commands: placement.commands} : undefined,
172
182
  drawerOpen: stageDrawer && drawerOpen && !stageHidden,
183
+ savedDrawerSelected: updateDrawer ? Boolean(drawerLayout?.selected) : undefined,
173
184
  editorFullscreen,
174
185
  focusDrawer: () => focusDrawer.current?.(),
175
186
  revealStage: () => {if (stageHidden) setStageVisible?.(true);}
@@ -3,6 +3,7 @@ import {createTargetList} from './targets.ts';
3
3
  import type {DrawerViews} from './drawer-views.ts';
4
4
  import {availableDrawerViews, createDrawerViewBar, hasDrawerBar, readDrawerView, writeDrawerView} from './drawer-views.ts';
5
5
  import {attachStageDrawerDrag} from './stage-drawer-drag.ts';
6
+ import type {StageDrawerLayout, StageDrawerPosition} from './workspace-layout.ts';
6
7
 
7
8
  export type {DrawerMenu, DrawerMenuRenderProps, DrawerRenderProps, DrawerView, DrawerViewId, DrawerViews,
8
9
  HostDrawerViewId} from './drawer-views.ts';
@@ -25,7 +26,9 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
25
26
 
26
27
  function StandardLayout({
27
28
  enabled, splitter, windowLayout, stageActionEnabled, stageDrawer = false,
28
- onPaletteModeChange, windowTools, Container, render, drawerViews = undefined as DrawerViews | undefined, ...props
29
+ onPaletteModeChange, windowTools, Container, render, drawerViews = undefined as DrawerViews | undefined,
30
+ stageDrawerLayout = undefined as StageDrawerLayout | undefined,
31
+ updateStageDrawer = undefined as ((patch: Partial<StageDrawerLayout>) => void) | undefined, ...props
29
32
  }) {
30
33
  const [showUndock, setShowUndock] = useState(false);
31
34
  const [targetsPinned, setTargetsPinned] = useState(true);
@@ -82,9 +85,12 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
82
85
  ((size?.height ?? 640) - 112) * props.stageAspect)));
83
86
  const defaultStageWidth = Math.min(maximumStageWidth, Math.floor(Math.min(props.defaultStageWidth, 360, bodyWidth / 2)));
84
87
  const minimumStageWidth = Math.min(defaultStageWidth, 280);
85
- const stageWidth = Math.max(minimumStageWidth, Math.min(maximumStageWidth, preferredStageWidth ?? defaultStageWidth));
88
+ const preferredWidth = stageDrawer && updateStageDrawer ? stageDrawerLayout?.width : preferredStageWidth;
89
+ const resizeStage = stageDrawer && updateStageDrawer ?
90
+ (width: number | undefined) => updateStageDrawer({width}) : setPreferredStageWidth;
91
+ const stageWidth = Math.max(minimumStageWidth, Math.min(maximumStageWidth, preferredWidth ?? defaultStageWidth));
86
92
  const stageResize = plusLayout && maximumStageWidth > minimumStageWidth ?
87
- {minimum: minimumStageWidth, maximum: maximumStageWidth, resize: setPreferredStageWidth} : null;
93
+ {minimum: minimumStageWidth, maximum: maximumStageWidth, resize: resizeStage} : null;
88
94
 
89
95
  useLayoutEffect(() => {
90
96
  if (enabled) onPaletteModeChange?.(true);
@@ -160,7 +166,7 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
160
166
  targetClassName: targetsPinned ? styles.standardTargets :
161
167
  `${styles.standardTargets} ${styles.retractedTargets}`,
162
168
  stageDisplayWidth: stageWidth,
163
- handleStagePreset: () => setPreferredStageWidth(null),
169
+ handleStagePreset: () => resizeStage(undefined),
164
170
  editorWidth: targetsPinned && resizable ? targetSplit.second : size?.width
165
171
  };
166
172
  };
@@ -190,22 +196,31 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
190
196
 
191
197
  function EdgeDrawer({edge, label, pinned = false, onOpenChange, portalContent = false, holdOpenSelector = '',
192
198
  focusPanelRef = undefined, closePanelRef = undefined, focusBoundary = undefined, showTrigger = true,
193
- movableStage = false, available = true, children}) {
199
+ movableStage = false, available = true, stageDrawerLayout = undefined as StageDrawerLayout | undefined,
200
+ updateStageDrawer = undefined as ((patch: Partial<StageDrawerLayout>) => void) | undefined, children}) {
194
201
  const [hovered, setHovered] = useState(false);
195
- const [engaged, setEngaged] = useState(false);
202
+ const [localEngaged, setLocalEngaged] = useState(false);
196
203
  const [heldOpen, setHeldOpen] = useState(false);
197
204
  const drawer = useRef(null);
198
205
  const trigger = useRef(null);
199
206
  const panel = useRef(null);
200
207
  const opened = useRef(false);
201
- const open = available && (pinned || hovered || engaged || heldOpen);
202
- const stageTrigger = movableStage && available && (showTrigger || opened.current);
208
+ const stageDrag = useRef(null);
209
+ const engaged = updateStageDrawer ? Boolean(stageDrawerLayout?.open) : localEngaged;
210
+ const setEngaged = React.useCallback((engaged: boolean) => {
211
+ if (updateStageDrawer) updateStageDrawer({open: engaged, ...(engaged && {selected: true})});
212
+ else setLocalEngaged(engaged);
213
+ }, [updateStageDrawer]);
214
+ const selected = updateStageDrawer ? Boolean(stageDrawerLayout?.selected) : opened.current;
215
+ const open = available && (pinned || engaged || heldOpen ||
216
+ (hovered && (!updateStageDrawer || showTrigger || selected)));
217
+ const stageTrigger = movableStage && available && (showTrigger || selected);
203
218
 
204
219
  useLayoutEffect(() => {
205
220
  if (open) opened.current = true;
206
221
  if (!available) {
207
222
  setHovered(false);
208
- setEngaged(false);
223
+ setLocalEngaged(false);
209
224
  }
210
225
  }, [open, available]);
211
226
 
@@ -215,8 +230,17 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
215
230
  const stage = node.closest<HTMLElement>(`.${styles.stageDrawer}`);
216
231
  const editor = stage?.closest<HTMLElement>(`.${styles.standardBody}`);
217
232
  if (!editor || !node.ownerDocument.defaultView?.ResizeObserver) return;
218
- return attachStageDrawerDrag(node, stage, editor, () => panel.current.focus({preventScroll: true}));
219
- }, [movableStage]);
233
+ const controller = attachStageDrawerDrag(node, stage, editor, () => panel.current.focus({preventScroll: true}),
234
+ (position: StageDrawerPosition) => updateStageDrawer?.({position}));
235
+ stageDrag.current = controller;
236
+ return () => {
237
+ stageDrag.current = null;
238
+ controller.dispose();
239
+ };
240
+ }, [movableStage, updateStageDrawer]);
241
+ useLayoutEffect(() => {
242
+ stageDrag.current?.setPosition(stageDrawerLayout?.position);
243
+ }, [movableStage, stageDrawerLayout?.position, updateStageDrawer]);
220
244
 
221
245
  useLayoutEffect(() => {
222
246
  if (!holdOpenSelector) return;
@@ -267,7 +291,7 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
267
291
  if (!focusPanelRef) return;
268
292
  focusPanelRef.current = focusPanel;
269
293
  return () => {focusPanelRef.current = null;};
270
- }, [focusPanelRef, available]);
294
+ }, [focusPanelRef, available, setEngaged]);
271
295
 
272
296
  const closePanel = React.useCallback(() => {
273
297
  setHovered(false);
@@ -276,7 +300,7 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
276
300
  if (button?.disabled) {
277
301
  button.ownerDocument.defaultView?.requestAnimationFrame(() => button.focus({preventScroll: true}));
278
302
  } else button?.focus({preventScroll: true});
279
- }, [focusBoundary, showTrigger]);
303
+ }, [focusBoundary, showTrigger, setEngaged]);
280
304
  useLayoutEffect(() => {
281
305
  if (!closePanelRef || !open) return;
282
306
  closePanelRef.current = closePanel;
@@ -293,7 +317,7 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
293
317
  if (!focusBoundary) return;
294
318
  focusBoundary.addEventListener('focusout', blur);
295
319
  return () => focusBoundary.removeEventListener('focusout', blur);
296
- }, [focusBoundary]);
320
+ }, [focusBoundary, setEngaged]);
297
321
 
298
322
  useLayoutEffect(() => {
299
323
  if (!portalContent) return;
@@ -309,7 +333,7 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
309
333
  node.removeEventListener('focusin', focus);
310
334
  node.removeEventListener('focusout', blur);
311
335
  };
312
- }, [portalContent, focusBoundary, open, showTrigger, movableStage]);
336
+ }, [portalContent, focusBoundary, open, showTrigger, movableStage, setEngaged]);
313
337
 
314
338
  useLayoutEffect(() => {
315
339
  if (!portalContent || !movableStage || !open) return;
@@ -14,6 +14,17 @@ export interface WindowPosition {left: number; top: number; width: number; heigh
14
14
  /** Panels that were open in one separate window when the layout was saved. */
15
15
  export interface SavedPopout {panels: string[]; position?: WindowPosition}
16
16
 
17
+ /** Coordinates along the drawer's available travel, with at least one axis at an edge. */
18
+ export interface StageDrawerPosition {x: number; y: number}
19
+
20
+ export interface StageDrawerLayout {
21
+ open: boolean;
22
+ /** Keep the drawer selected after it folds into the edge. */
23
+ selected: boolean;
24
+ position?: StageDrawerPosition;
25
+ width?: number;
26
+ }
27
+
17
28
  export interface WorkspaceLayout {
18
29
  version: 1;
19
30
  project: string;
@@ -21,6 +32,7 @@ export interface WorkspaceLayout {
21
32
  activeGroup: string;
22
33
  editingView?: string;
23
34
  panels: Record<string, PanelReference>;
35
+ stageDrawer?: StageDrawerLayout;
24
36
  /** Separate windows are restored docked; the user reopens each one. */
25
37
  popouts?: SavedPopout[];
26
38
  }
@@ -191,11 +203,27 @@ export function readWorkspaceLayout(raw: string, project?: string): WorkspaceLay
191
203
  if (editingView !== undefined && (!validId(editingView) || panels[editingView]?.kind !== 'sprite')) return;
192
204
  const popouts = readPopouts(input.popouts, panels);
193
205
  if (!popouts) return;
206
+ const stageDrawer = readStageDrawer(input.stageDrawer);
194
207
  return {version: 1, project: input.project, grid: {root, width, height, orientation}, activeGroup: input.activeGroup,
195
208
  editingView: typeof editingView === 'string' ? editingView : undefined, panels,
209
+ ...(stageDrawer && {stageDrawer}),
196
210
  ...(popouts.length && {popouts})};
197
211
  }
198
212
 
213
+ function readStageDrawer(input: unknown): StageDrawerLayout | undefined {
214
+ if (!record(input) || typeof input.open !== 'boolean' || typeof input.selected !== 'boolean') return;
215
+ const {position, width} = input;
216
+ const fraction = (value: unknown): value is number => size(value) && value <= 1;
217
+ const edge = (value: number) => value === 0 || value === 1;
218
+ return {
219
+ open: input.open,
220
+ selected: input.open || input.selected,
221
+ ...(size(width) && width > 0 && {width}),
222
+ ...(record(position) && fraction(position.x) && fraction(position.y) &&
223
+ (edge(position.x) || edge(position.y)) && {position: {x: position.x, y: position.y}})
224
+ };
225
+ }
226
+
199
227
  function readPopouts(input: unknown, panels: WorkspaceLayout['panels']): SavedPopout[] | undefined {
200
228
  if (input === undefined) return [];
201
229
  if (!Array.isArray(input) || input.length > limit) return;