@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.
@@ -1,6 +1,6 @@
1
1
  import { createLayout, createSplitter, splitAxis } from "./index.js";
2
2
  import { createTargetList } from "./targets.js";
3
- import { availableDrawerViews, createDrawerViewBar, hasDrawerBar, readDrawerView, writeDrawerView } from "./drawer-views.js";
3
+ import { availableDrawerViews, createDrawerViewBar, drawerPinIcon, hasDrawerBar, readDrawerView, writeDrawerView } from "./drawer-views.js";
4
4
  import { attachStageDrawerDrag } from "./stage-drawer-drag.js";
5
5
  const isJapanese = locale => /^ja(?:-|$)/i.test(locale);
6
6
  const singleColumnTargetWidth = 108;
@@ -16,11 +16,12 @@ 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);
23
23
  const [stageDrawerOpen, setStageDrawerOpen] = useState(false);
24
+ const [localStageDrawerPinned, setLocalStageDrawerPinned] = useState(true);
24
25
  const [size, setSize] = useState(null);
25
26
  const [targetRatio, setTargetRatio] = useState(null);
26
27
  const [viewRatio, setViewRatio] = useState(null);
@@ -37,6 +38,13 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
37
38
  const body = useRef(null);
38
39
  const plusLayout = enabled && !props.fullscreen;
39
40
  const stageHidden = plusLayout && !showStage;
41
+ const stageDrawerPinned = updateStageDrawer ? stageDrawerLayout?.pinned !== false : localStageDrawerPinned;
42
+ const setStageDrawerPinned = (pinned) => {
43
+ if (updateStageDrawer)
44
+ updateStageDrawer({ pinned });
45
+ else
46
+ setLocalStageDrawerPinned(pinned);
47
+ };
40
48
  const japanese = isJapanese(props.locale);
41
49
  const undockLabel = japanese ? 'アンドックボタンを表示' : 'Show undock buttons';
42
50
  const layoutMenuLabel = japanese ? '配置メニュー' : 'Layout options';
@@ -67,9 +75,12 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
67
75
  const maximumStageWidth = Math.max(1, Math.floor(Math.min(editorSpace - 24, stageDrawer ? (size?.viewportWidth ?? bodyWidth) - 12 : Infinity, ((size?.height ?? 640) - 112) * props.stageAspect)));
68
76
  const defaultStageWidth = Math.min(maximumStageWidth, Math.floor(Math.min(props.defaultStageWidth, 360, bodyWidth / 2)));
69
77
  const minimumStageWidth = Math.min(defaultStageWidth, 280);
70
- const stageWidth = Math.max(minimumStageWidth, Math.min(maximumStageWidth, preferredStageWidth ?? defaultStageWidth));
78
+ const preferredWidth = stageDrawer && updateStageDrawer ? stageDrawerLayout?.width : preferredStageWidth;
79
+ const resizeStage = stageDrawer && updateStageDrawer ?
80
+ (width) => updateStageDrawer({ width }) : setPreferredStageWidth;
81
+ const stageWidth = Math.max(minimumStageWidth, Math.min(maximumStageWidth, preferredWidth ?? defaultStageWidth));
71
82
  const stageResize = plusLayout && maximumStageWidth > minimumStageWidth ?
72
- { minimum: minimumStageWidth, maximum: maximumStageWidth, resize: setPreferredStageWidth } : null;
83
+ { minimum: minimumStageWidth, maximum: maximumStageWidth, resize: resizeStage } : null;
73
84
  useLayoutEffect(() => {
74
85
  if (enabled)
75
86
  onPaletteModeChange?.(true);
@@ -147,7 +158,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
147
158
  targetClassName: targetsPinned ? styles.standardTargets :
148
159
  `${styles.standardTargets} ${styles.retractedTargets}`,
149
160
  stageDisplayWidth: stageWidth,
150
- handleStagePreset: () => setPreferredStageWidth(null),
161
+ handleStagePreset: () => resizeStage(undefined),
151
162
  editorWidth: targetsPinned && resizable ? targetSplit.second : size?.width
152
163
  };
153
164
  };
@@ -168,26 +179,37 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
168
179
  });
169
180
  return element(context.Provider, { value: {
170
181
  showUndock, plusLayout, targetsPinned, setTargetsPinned, stageHidden, setStageVisible: setShowStage, stageResize, stageActionMount,
171
- stageDrawer: plusLayout && stageDrawer, setStageDrawerOpen, locale: props.locale,
182
+ stageDrawer: plusLayout && stageDrawer, stageDrawerPinned, setStageDrawerPinned, setStageDrawerOpen,
183
+ locale: props.locale,
172
184
  drawerViews, drawerView, selectDrawerView
173
185
  } }, Container ? element(Container, { locale: props.locale }, layout) : layout);
174
186
  }
175
- function EdgeDrawer({ edge, label, pinned = false, onOpenChange, portalContent = false, holdOpenSelector = '', focusPanelRef = undefined, closePanelRef = undefined, focusBoundary = undefined, showTrigger = true, movableStage = false, available = true, children }) {
187
+ function EdgeDrawer({ edge, label, pinned = false, onOpenChange, portalContent = false, holdOpenSelector = '', focusPanelRef = undefined, closePanelRef = undefined, focusBoundary = undefined, showTrigger = true, movableStage = false, available = true, keepOpenOnBlur = false, stageDrawerLayout = undefined, updateStageDrawer = undefined, children }) {
176
188
  const [hovered, setHovered] = useState(false);
177
- const [engaged, setEngaged] = useState(false);
189
+ const [localEngaged, setLocalEngaged] = useState(false);
178
190
  const [heldOpen, setHeldOpen] = useState(false);
179
191
  const drawer = useRef(null);
180
192
  const trigger = useRef(null);
181
193
  const panel = useRef(null);
182
194
  const opened = useRef(false);
183
- const open = available && (pinned || hovered || engaged || heldOpen);
184
- const stageTrigger = movableStage && available && (showTrigger || opened.current);
195
+ const stageDrag = useRef(null);
196
+ const engaged = updateStageDrawer ? Boolean(stageDrawerLayout?.open) : localEngaged;
197
+ const setEngaged = React.useCallback((engaged) => {
198
+ if (updateStageDrawer)
199
+ updateStageDrawer({ open: engaged, ...(engaged && { selected: true }) });
200
+ else
201
+ setLocalEngaged(engaged);
202
+ }, [updateStageDrawer]);
203
+ const selected = updateStageDrawer ? Boolean(stageDrawerLayout?.selected) : opened.current;
204
+ const open = available && (pinned || engaged || heldOpen ||
205
+ (hovered && (!updateStageDrawer || showTrigger || selected)));
206
+ const stageTrigger = movableStage && available && (showTrigger || selected);
185
207
  useLayoutEffect(() => {
186
208
  if (open)
187
209
  opened.current = true;
188
210
  if (!available) {
189
211
  setHovered(false);
190
- setEngaged(false);
212
+ setLocalEngaged(false);
191
213
  }
192
214
  }, [open, available]);
193
215
  useLayoutEffect(() => {
@@ -198,8 +220,16 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
198
220
  const editor = stage?.closest(`.${styles.standardBody}`);
199
221
  if (!editor || !node.ownerDocument.defaultView?.ResizeObserver)
200
222
  return;
201
- return attachStageDrawerDrag(node, stage, editor, () => panel.current.focus({ preventScroll: true }));
202
- }, [movableStage]);
223
+ const controller = attachStageDrawerDrag(node, stage, editor, () => panel.current.focus({ preventScroll: true }), (position) => updateStageDrawer?.({ position }));
224
+ stageDrag.current = controller;
225
+ return () => {
226
+ stageDrag.current = null;
227
+ controller.dispose();
228
+ };
229
+ }, [movableStage, updateStageDrawer]);
230
+ useLayoutEffect(() => {
231
+ stageDrag.current?.setPosition(stageDrawerLayout?.position);
232
+ }, [movableStage, stageDrawerLayout?.position, updateStageDrawer]);
203
233
  useLayoutEffect(() => {
204
234
  if (!holdOpenSelector)
205
235
  return;
@@ -232,6 +262,8 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
232
262
  setEngaged(true);
233
263
  };
234
264
  const blur = (event) => {
265
+ if (keepOpenOnBlur)
266
+ return;
235
267
  const target = event.relatedTarget;
236
268
  const source = event.target;
237
269
  // Opening the stage disables the launcher before focus moves into the drawer.
@@ -255,7 +287,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
255
287
  return;
256
288
  focusPanelRef.current = focusPanel;
257
289
  return () => { focusPanelRef.current = null; };
258
- }, [focusPanelRef, available]);
290
+ }, [focusPanelRef, available, setEngaged]);
259
291
  const closePanel = React.useCallback(() => {
260
292
  setHovered(false);
261
293
  setEngaged(false);
@@ -265,7 +297,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
265
297
  }
266
298
  else
267
299
  button?.focus({ preventScroll: true });
268
- }, [focusBoundary, showTrigger]);
300
+ }, [focusBoundary, showTrigger, setEngaged]);
269
301
  useLayoutEffect(() => {
270
302
  if (!closePanelRef || !open)
271
303
  return;
@@ -284,7 +316,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
284
316
  return;
285
317
  focusBoundary.addEventListener('focusout', blur);
286
318
  return () => focusBoundary.removeEventListener('focusout', blur);
287
- }, [focusBoundary]);
319
+ }, [focusBoundary, keepOpenOnBlur, setEngaged]);
288
320
  useLayoutEffect(() => {
289
321
  if (!portalContent)
290
322
  return;
@@ -300,7 +332,22 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
300
332
  node.removeEventListener('focusin', focus);
301
333
  node.removeEventListener('focusout', blur);
302
334
  };
303
- }, [portalContent, focusBoundary, open, showTrigger, movableStage]);
335
+ }, [portalContent, focusBoundary, open, showTrigger, movableStage, keepOpenOnBlur, setEngaged]);
336
+ useLayoutEffect(() => {
337
+ if (!movableStage || keepOpenOnBlur || !open)
338
+ return;
339
+ const node = drawer.current;
340
+ const dismiss = (event) => {
341
+ const target = event.target;
342
+ if (node.contains(target) || focusBoundary?.contains(target))
343
+ return;
344
+ setHovered(false);
345
+ setEngaged(false);
346
+ };
347
+ // The restored drawer may be open without having received focus.
348
+ node.ownerDocument.addEventListener('pointerdown', dismiss, true);
349
+ return () => node.ownerDocument.removeEventListener('pointerdown', dismiss, true);
350
+ }, [movableStage, keepOpenOnBlur, open, focusBoundary, setEngaged]);
304
351
  useLayoutEffect(() => {
305
352
  if (!portalContent || !movableStage || !open)
306
353
  return;
@@ -394,8 +441,7 @@ export function createStandardLayout(React, { styles, targetStyles, context, Lay
394
441
  function DrawerPinButton({ label }) {
395
442
  const { targetsPinned, setTargetsPinned } = useContext(context);
396
443
  return element('button', { type: 'button', className: styles.drawerPin, 'aria-label': label, 'aria-pressed': targetsPinned,
397
- title: label, onClick: () => setTargetsPinned(value => !value) }, element('svg', { 'aria-hidden': true, width: 14, height: 14, viewBox: '0 0 16 16',
398
- fill: targetsPinned ? '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' }), !targetsPinned && element('path', { d: 'M2 2l12 12', strokeLinecap: 'round' })));
444
+ title: label, onClick: () => setTargetsPinned(value => !value) }, drawerPinIcon(element, targetsPinned));
399
445
  }
400
446
  function useSpriteListTools() {
401
447
  const { locale } = useContext(context);
@@ -23,6 +23,20 @@ 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
+ /** Missing in older records, which use the default pinned behavior. */
36
+ pinned?: boolean;
37
+ position?: StageDrawerPosition;
38
+ width?: number;
39
+ }
26
40
  export interface WorkspaceLayout {
27
41
  version: 1;
28
42
  project: string;
@@ -30,6 +44,7 @@ export interface WorkspaceLayout {
30
44
  activeGroup: string;
31
45
  editingView?: string;
32
46
  panels: Record<string, PanelReference>;
47
+ stageDrawer?: StageDrawerLayout;
33
48
  /** Separate windows are restored docked; the user reopens each one. */
34
49
  popouts?: SavedPopout[];
35
50
  }
@@ -189,10 +189,27 @@ 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, pinned } = 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
+ ...(typeof pinned === 'boolean' && { pinned }),
208
+ ...(size(width) && width > 0 && { width }),
209
+ ...(record(position) && fraction(position.x) && fraction(position.y) &&
210
+ (edge(position.x) || edge(position.y)) && { position: { x: position.x, y: position.y } })
211
+ };
212
+ }
196
213
  function readPopouts(input, panels) {
197
214
  if (input === undefined)
198
215
  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.9.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,24 @@ 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.pinned === previous?.pinned && next.position === previous?.position && next.width === previous?.width) return;
41
+ restoreDrawer(next.open || next.selected || next.pinned !== undefined || next.position || next.width ?
42
+ next : undefined);
43
+ for (const listener of drawerListeners) listener();
44
+ }, [drawerListeners, restoreDrawer]);
45
+ const resetDrawerPresentation = React.useCallback(() => updateDrawer({open: false, selected: false}),
46
+ [updateDrawer]);
23
47
 
24
48
  const move = React.useCallback(() => {
25
49
  const destination = suspended.current ? inline.current : dock.current ?? inline.current;
@@ -43,10 +67,18 @@ export function useDockviewStage(enabled: boolean, locale: string) {
43
67
  move();
44
68
  setDocked(Boolean(destination));
45
69
  },
46
- connect: setCommands
47
- }), [japanese, move]);
70
+ connect: setCommands,
71
+ drawer: {
72
+ read: () => savedDrawer.current,
73
+ restore: restoreDrawer,
74
+ subscribe(listener) {
75
+ drawerListeners.add(listener);
76
+ return () => {drawerListeners.delete(listener);};
77
+ }
78
+ }
79
+ }), [japanese, move, restoreDrawer, drawerListeners]);
48
80
  return surface && {
49
- surface, pane, docked, commands, inlineRef, suspend,
81
+ surface, pane, docked, commands, inlineRef, suspend, drawerLayout, updateDrawer, resetDrawerPresentation,
50
82
  openLabel: japanese ? 'ステージをタブで開く' : 'Open stage in workspace',
51
83
  closeLabel: japanese ? 'ステージを元の位置に戻す' : 'Return stage from workspace'
52
84
  };
@@ -59,6 +59,13 @@ 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
59
59
  export const isJapanese =(locale: string) => /^ja(?:-|$)/i.test(locale ?? '');
60
60
  export const drawerLabel = (id: keyof typeof names, locale: string) => names[id][isJapanese(locale) ? 0 : 1];
61
61
 
62
+ export function drawerPinIcon(element: typeof import('react').createElement, pinned: boolean) {
63
+ return element('svg', {'aria-hidden': true, width: 14, height: 14, viewBox: '0 0 16 16',
64
+ fill: pinned ? 'currentColor' : 'none', stroke: 'currentColor', strokeWidth: 1.2, strokeLinejoin: 'round'},
65
+ 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'}),
66
+ !pinned && element('path', {d: 'M2 2l12 12', strokeLinecap: 'round'}));
67
+ }
68
+
62
69
  /** The supported host views in button order, without unknown or repeated ids. */
63
70
  export function availableDrawerViews(drawerViews: DrawerViews | undefined): DrawerView[] {
64
71
  const views = drawerViews?.views ?? [];
@@ -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
  }
@@ -1,4 +1,5 @@
1
1
  import React, {createElement as element, type ComponentType} from 'react';
2
+ import {drawerPinIcon} from './drawer-views.ts';
2
3
 
3
4
  const labels = {
4
5
  ja: {
@@ -6,14 +7,18 @@ const labels = {
6
7
  menu: 'ステージの開き方',
7
8
  window: '別ウィンドウで表示',
8
9
  tab: 'タブで表示',
9
- drawer: '引出しで表示'
10
+ drawer: '引出しで表示',
11
+ pinDrawer: '引出しを常時表示する',
12
+ autoHideDrawer: '引出しを自動的に隠す'
10
13
  },
11
14
  en: {
12
15
  open: 'Open stage',
13
16
  menu: 'Stage opening options',
14
17
  window: 'Show in a separate window',
15
18
  tab: 'Show in a tab',
16
- drawer: 'Show in the drawer'
19
+ drawer: 'Show in the drawer',
20
+ pinDrawer: 'Keep the drawer open',
21
+ autoHideDrawer: 'Automatically hide the drawer'
17
22
  }
18
23
  };
19
24
 
@@ -36,6 +41,16 @@ export function stagePresentationItems(locale: string, current: StageMode | null
36
41
  }));
37
42
  }
38
43
 
44
+ export function stageDrawerPinItem(locale: string, pinned: boolean, setPinned: (pinned: boolean) => void) {
45
+ const text = textFor(locale);
46
+ return {
47
+ id: 'drawer-pin',
48
+ label: pinned ? text.autoHideDrawer : text.pinDrawer,
49
+ icon: drawerPinIcon(element, !pinned),
50
+ onSelect: () => setPinned(!pinned)
51
+ };
52
+ }
53
+
39
54
  export function useStageDocumentFullscreen(doc?: Document) {
40
55
  const [fullscreenDocument, setFullscreenDocument] = React.useState<Document>();
41
56
  React.useLayoutEffect(() => {
@@ -75,13 +90,16 @@ interface StageLauncherProps {
75
90
  dockAction?: StageDockAction;
76
91
  tab?: {docked: boolean; commands: {open(): void} | null};
77
92
  drawerOpen: boolean;
93
+ savedDrawerSelected?: boolean;
78
94
  editorFullscreen?: boolean;
79
95
  focusDrawer(): void;
80
96
  revealStage(): void;
81
97
  }
82
98
 
83
- export function StageLauncher({locale, options, dockAction, tab, drawerOpen, editorFullscreen, focusDrawer, revealStage}: StageLauncherProps) {
84
- const [drawerSelected, setDrawerSelected] = React.useState(false);
99
+ export function StageLauncher({locale, options, dockAction, tab, drawerOpen, savedDrawerSelected, editorFullscreen,
100
+ focusDrawer, revealStage}: StageLauncherProps) {
101
+ const [localDrawerSelected, setLocalDrawerSelected] = React.useState(false);
102
+ const drawerSelected = savedDrawerSelected ?? localDrawerSelected;
85
103
  const {styles, MenuButton} = options;
86
104
  const text = textFor(locale);
87
105
  const separate = dockAction?.kind === 'opening' || dockAction?.kind === 'external';
@@ -95,8 +113,8 @@ export function StageLauncher({locale, options, dockAction, tab, drawerOpen, edi
95
113
  const defaultTarget = drawerSelected || !available.window ? 'drawer' : 'window';
96
114
 
97
115
  React.useLayoutEffect(() => {
98
- if (mode && !editorFullscreen) setDrawerSelected(mode === 'drawer');
99
- }, [mode, editorFullscreen]);
116
+ if (savedDrawerSelected === undefined && mode && !editorFullscreen) setLocalDrawerSelected(mode === 'drawer');
117
+ }, [mode, editorFullscreen, savedDrawerSelected]);
100
118
 
101
119
  function activate(target: StageMode) {
102
120
  if (disabled || !available[target]) return;
@@ -5,7 +5,7 @@ import {createDockview, themeLight} from 'dockview';
5
5
  import {StageLauncher, type StageDockAction, type StageLauncherOptions} from './stage-launcher.ts';
6
6
 
7
7
  export type {StageDockAction, StageLauncherOptions} from './stage-launcher.ts';
8
- export {stagePresentationItems, useStageDocumentFullscreen} from './stage-launcher.ts';
8
+ export {stageDrawerPinItem, stagePresentationItems, useStageDocumentFullscreen} from './stage-launcher.ts';
9
9
  export {StageResizeHandle} from './stage-resize-handle.ts';
10
10
 
11
11
  interface StageWindowConnection<Target> {
@@ -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
@@ -111,6 +112,7 @@ export function createStageSurface(React: typeof import('react'), {
111
112
  context: Context<{
112
113
  locale: string;
113
114
  stageDrawer?: boolean;
115
+ stageDrawerPinned?: boolean;
114
116
  stageHidden?: boolean;
115
117
  setStageDrawerOpen?(open: boolean): void;
116
118
  setStageVisible?(visible: boolean): void;
@@ -128,10 +130,18 @@ export function createStageSurface(React: typeof import('react'), {
128
130
  editorFullscreen?: boolean;
129
131
  [key: string]: any;
130
132
  }) {
131
- const {locale, stageDrawer, stageHidden, setStageDrawerOpen, setStageVisible} = React.useContext(context);
133
+ const {locale, stageDrawer, stageDrawerPinned = true, stageHidden, setStageDrawerOpen, setStageVisible} =
134
+ React.useContext(context);
132
135
  const [drawerOpen, setDrawerOpen] = React.useState(false);
133
136
  const localDrawerRef = React.useRef<() => void>(null);
134
137
  const focusDrawer = openDrawerRef ?? localDrawerRef;
138
+ const updateDrawer = placement?.updateDrawer;
139
+ const resetDrawerPresentation = placement?.resetDrawerPresentation;
140
+ const drawerLayout = placement?.drawerLayout;
141
+ const stageOutsideDrawer = Boolean(editorFullscreen || dockAction?.kind === 'external' || placement?.docked);
142
+ React.useLayoutEffect(() => {
143
+ if (stageOutsideDrawer) resetDrawerPresentation?.();
144
+ }, [stageOutsideDrawer, resetDrawerPresentation, drawerLayout?.open, drawerLayout?.selected]);
135
145
  const onOpenChange = React.useCallback((open: boolean) => {
136
146
  setStageDrawerOpen?.(open);
137
147
  setDrawerOpen(open);
@@ -155,7 +165,10 @@ export function createStageSurface(React: typeof import('react'), {
155
165
  const dock = stageDrawer ? React.createElement(EdgeDrawer, {
156
166
  edge: 'right',
157
167
  movableStage: true,
168
+ keepOpenOnBlur: stageDrawerPinned,
158
169
  available: !placement?.docked && (!dockAction || dockAction.kind === 'docked'),
170
+ stageDrawerLayout: drawerLayout,
171
+ updateStageDrawer: updateDrawer,
159
172
  label: japanese ? 'ステージを展開' : 'Reveal stage',
160
173
  onOpenChange,
161
174
  focusPanelRef: launcher ? focusDrawer : undefined,
@@ -170,6 +183,7 @@ export function createStageSurface(React: typeof import('react'), {
170
183
  locale, options: launcher, dockAction,
171
184
  tab: placement?.commands ? {docked: placement.docked, commands: placement.commands} : undefined,
172
185
  drawerOpen: stageDrawer && drawerOpen && !stageHidden,
186
+ savedDrawerSelected: updateDrawer ? Boolean(drawerLayout?.selected) : undefined,
173
187
  editorFullscreen,
174
188
  focusDrawer: () => focusDrawer.current?.(),
175
189
  revealStage: () => {if (stageHidden) setStageVisible?.(true);}