@kubohiroya/turbowarp-plus-editor-workbench 0.4.0 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ja.md +42 -0
- package/README.md +42 -0
- package/dist/ai-agent-settings.d.ts +97 -0
- package/dist/ai-agent-settings.js +316 -0
- package/dist/ai-agents.d.ts +24 -0
- package/dist/ai-agents.js +75 -0
- package/dist/drawer-views.d.ts +66 -0
- package/dist/drawer-views.js +152 -0
- package/dist/sprite-tabs.d.ts +20 -0
- package/dist/sprite-tabs.js +101 -20
- package/dist/standard-layout.d.ts +4 -1
- package/dist/standard-layout.js +57 -13
- package/dist/target-tab-menu.d.ts +29 -0
- package/dist/target-tab-menu.js +76 -0
- package/dist/workspace-layout.d.ts +1 -0
- package/dist/workspace-layout.js +6 -2
- package/package.json +5 -1
- package/src/ai-agent-settings.ts +380 -0
- package/src/ai-agents.ts +95 -0
- package/src/drawer-views.ts +203 -0
- package/src/editor.css +270 -0
- package/src/sprite-layout-menu.css +37 -0
- package/src/sprite-tabs.ts +100 -20
- package/src/standard-layout.ts +67 -17
- package/src/target-tab-menu.ts +99 -0
- package/src/workspace-layout.ts +6 -3
package/src/sprite-tabs.ts
CHANGED
|
@@ -19,12 +19,14 @@ import type {SpriteVariableEdit, SpriteVariableEditError} from '@kubohiroya/turb
|
|
|
19
19
|
import {SpriteMessagePane} from '@kubohiroya/turbowarp-plus-editor-sprite-panes/sprite-message-pane';
|
|
20
20
|
import type {MessageRenameError} from '@kubohiroya/turbowarp-plus-editor-sprite-panes/sprite-message-pane';
|
|
21
21
|
import type {MessageUse, ProjectMessage, TargetMessages} from '@kubohiroya/turbowarp-plus-editor-project-model/project-messages';
|
|
22
|
+
import {createRenameMenuItem, spriteRenameLabel} from './target-tab-menu.ts';
|
|
22
23
|
|
|
23
24
|
export {getDocumentWorkspace} from './document-workspace.ts';
|
|
24
25
|
export type {SpriteAssetKind, SpriteAssetPreviewItem} from '@kubohiroya/turbowarp-plus-editor-sprite-panes/sprite-asset-pane';
|
|
25
26
|
export {editSpriteVariable} from '@kubohiroya/turbowarp-plus-editor-project-model/sprite-variable-edit';
|
|
26
27
|
|
|
27
28
|
export {useDockviewStage} from './dockview-stage.ts';
|
|
29
|
+
export {SpriteTargetTabsContext, useTargetTabMenu} from './target-tab-menu.ts';
|
|
28
30
|
|
|
29
31
|
interface CostumeAsset {
|
|
30
32
|
encodeDataURI(): string;
|
|
@@ -193,14 +195,15 @@ interface TabSlot {
|
|
|
193
195
|
interface View<Snapshot> {
|
|
194
196
|
id: string;
|
|
195
197
|
target: Target;
|
|
198
|
+
number?: number;
|
|
196
199
|
section: number;
|
|
197
200
|
assets: ReturnType<typeof createAssetSelections>;
|
|
198
201
|
snapshots?: Map<number, {snapshot: Snapshot; view: SpriteTabView}>;
|
|
199
202
|
}
|
|
200
203
|
|
|
201
204
|
const renameLabels = {
|
|
202
|
-
en: {title: '
|
|
203
|
-
ja: {title: '
|
|
205
|
+
en: {title: spriteRenameLabel('en'), name: 'Sprite name', cancel: 'Cancel', save: 'Rename'},
|
|
206
|
+
ja: {title: spriteRenameLabel('ja'), name: 'スプライト名', cancel: 'キャンセル', save: '変更'}
|
|
204
207
|
};
|
|
205
208
|
type RenameLabels = typeof renameLabels.en;
|
|
206
209
|
const targetName = (target: Target) => target.isStage ? 'Stage' : target.getName();
|
|
@@ -244,7 +247,9 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
244
247
|
const japanese = /^ja(?:-|$)/i.test(locale);
|
|
245
248
|
const editLabel = japanese ? 'クリックしてこのビューで編集' : 'Activate this view to edit';
|
|
246
249
|
const backdropTitle = japanese ? '背景' : 'Backdrops';
|
|
247
|
-
const
|
|
250
|
+
const baseTitle = (target: Target) => target.isStage ? backdropTitle : target.getName();
|
|
251
|
+
const numberedTitle = (target: Target, number: number) => `${baseTitle(target)}(${number})`;
|
|
252
|
+
const tabTitle = ({target, number}: View<Snapshot>) => number ? numberedTitle(target, number) : baseTitle(target);
|
|
248
253
|
const chipText = japanese ?
|
|
249
254
|
{collapse: 'グループを折りたたむ', expand: 'グループを展開する', close: 'このグループのタブを閉じる', closeAll: 'この分割パネルの文書タブをすべて閉じる'} :
|
|
250
255
|
{collapse: 'Collapse group', expand: 'Expand group', close: 'Close the tabs of this group', closeAll: 'Close all document tabs of this split'};
|
|
@@ -295,10 +300,23 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
295
300
|
}}
|
|
296
301
|
],
|
|
297
302
|
getTabContextMenuItems: ({panel}) => {
|
|
298
|
-
const
|
|
299
|
-
if (!
|
|
300
|
-
|
|
303
|
+
const view = views.get(panel.id);
|
|
304
|
+
if (!view) return [];
|
|
305
|
+
const items = [];
|
|
306
|
+
if (multiView) items.push({
|
|
307
|
+
label: japanese ? '新しいタブで開く' : 'Open in new tab',
|
|
308
|
+
action: () => openInNewTab(view.id)
|
|
309
|
+
});
|
|
310
|
+
if (!view.target.isStage && vm.renameSprite) items.push({
|
|
311
|
+
component: 'rename-sprite'
|
|
312
|
+
});
|
|
313
|
+
return items;
|
|
301
314
|
},
|
|
315
|
+
createContextMenuItemComponent: ({component}) => component === 'rename-sprite' ?
|
|
316
|
+
createRenameMenuItem(document, text.title, id => {
|
|
317
|
+
const target = views.get(id)?.target;
|
|
318
|
+
if (target) openRenameDialog(target);
|
|
319
|
+
}) : undefined,
|
|
302
320
|
createComponent: ({name, id: componentId}) => {
|
|
303
321
|
const element = document.createElement('div');
|
|
304
322
|
if (name === documentComponent) {
|
|
@@ -618,23 +636,48 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
618
636
|
refreshSurfaces();
|
|
619
637
|
}
|
|
620
638
|
|
|
621
|
-
function
|
|
639
|
+
function nextTabNumber(target: Target, titles: ReadonlySet<string>) {
|
|
640
|
+
let number = 2;
|
|
641
|
+
while (titles.has(numberedTitle(target, number))) number++;
|
|
642
|
+
return number;
|
|
643
|
+
}
|
|
644
|
+
|
|
645
|
+
function reservedTitles() {
|
|
646
|
+
return new Set([...originalTargets().map(baseTitle),
|
|
647
|
+
...dockview.panels.filter(panel => !views.has(panel.id)).map(panel => panel.title)]);
|
|
648
|
+
}
|
|
649
|
+
|
|
650
|
+
function assignTabNumbers(items: Iterable<View<Snapshot>>, titles = reservedTitles()) {
|
|
651
|
+
const originals = new Set<Target>();
|
|
652
|
+
for (const view of items) {
|
|
653
|
+
if (!view.number && !originals.has(view.target)) {
|
|
654
|
+
originals.add(view.target);
|
|
655
|
+
continue;
|
|
656
|
+
}
|
|
657
|
+
if (!view.number || titles.has(tabTitle(view))) view.number = nextTabNumber(view.target, titles);
|
|
658
|
+
titles.add(tabTitle(view));
|
|
659
|
+
}
|
|
660
|
+
}
|
|
661
|
+
|
|
662
|
+
function add(target: Target, position?: {referencePanel: string; direction: SpriteSplitDirection | 'within'}, section?: number) {
|
|
622
663
|
let id = target.id;
|
|
623
|
-
if (
|
|
664
|
+
if (position || views.has(id) || id === stagePanelId || documents.has(id)) {
|
|
624
665
|
do {
|
|
625
666
|
id = 'sprite-view-' + ++nextView;
|
|
626
667
|
} while (views.has(id) || documents.has(id) || vm.runtime.targets.some(item => item.id === id));
|
|
627
668
|
}
|
|
628
|
-
const source =
|
|
669
|
+
const source = position && views.get(position.referencePanel);
|
|
629
670
|
// An inactive panel leaves dockview without an active group, and dockview then opens each later
|
|
630
671
|
// panel in a new group; keep sprites added without a split as tabs of an existing sprite group.
|
|
631
|
-
const spriteGroup = !
|
|
672
|
+
const spriteGroup = !position && !dockview.activeGroup &&
|
|
632
673
|
dockview.groups.find(group => group.panels.some(panel => views.has(panel.id)));
|
|
633
|
-
|
|
634
|
-
|
|
674
|
+
const view = {id, target, section: section ?? remembered.get(target) ?? options.getSection(),
|
|
675
|
+
number: source && nextTabNumber(target, new Set([...reservedTitles(), ...[...views.values()].map(tabTitle)])),
|
|
676
|
+
assets: createAssetSelections(target, locale, source?.assets)};
|
|
677
|
+
views.set(id, view);
|
|
635
678
|
try {
|
|
636
|
-
return dockview.addPanel({id, title: tabTitle(
|
|
637
|
-
position:
|
|
679
|
+
return dockview.addPanel({id, title: tabTitle(view), component: 'sprite', inactive: !position,
|
|
680
|
+
position: position ?? (spriteGroup ? {referenceGroup: spriteGroup} : undefined),
|
|
638
681
|
params: {icon: getIcon(target)}});
|
|
639
682
|
} catch (error) {
|
|
640
683
|
views.delete(id);
|
|
@@ -664,6 +707,26 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
664
707
|
activateView(view?.id ?? add(target).id);
|
|
665
708
|
}
|
|
666
709
|
|
|
710
|
+
function targetTabs(id?: string) {
|
|
711
|
+
return dockview.groups.map(group => ({group, rect: group.element.getBoundingClientRect()}))
|
|
712
|
+
.sort((a, b) => Number(a.group.api.location.type !== 'grid') - Number(b.group.api.location.type !== 'grid') ||
|
|
713
|
+
a.rect.left - b.rect.left || a.rect.top - b.rect.top)
|
|
714
|
+
.flatMap(({group}) => group.panels.flatMap(panel => {
|
|
715
|
+
const target = views.get(panel.id)?.target;
|
|
716
|
+
return target && (id === undefined ? target.isStage : target.id === id) ?
|
|
717
|
+
[{id: panel.id, title: panel.title}] : [];
|
|
718
|
+
}));
|
|
719
|
+
}
|
|
720
|
+
|
|
721
|
+
function selectFromList(id?: string) {
|
|
722
|
+
const first = targetTabs(id)[0];
|
|
723
|
+
if (first) activateView(first.id);
|
|
724
|
+
else {
|
|
725
|
+
const target = originalTargets().find(item => id === undefined ? item.isStage : item.id === id);
|
|
726
|
+
if (target) select(target.id);
|
|
727
|
+
}
|
|
728
|
+
}
|
|
729
|
+
|
|
667
730
|
function openDocument(request: DocumentPanelRequest) {
|
|
668
731
|
if (pendingRestore) finishRestore();
|
|
669
732
|
const {providerId, documentId} = request.reference;
|
|
@@ -747,7 +810,7 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
747
810
|
dockview.getPanel(stagePanelId)?.api.close();
|
|
748
811
|
}
|
|
749
812
|
|
|
750
|
-
function
|
|
813
|
+
function addView(direction: SpriteSplitDirection | 'within', id = active?.id) {
|
|
751
814
|
const reference = views.get(id);
|
|
752
815
|
if (!multiView || !reference) return;
|
|
753
816
|
const section = reference === active && usesNativeSection(reference.section) ? options.getSection() : reference.section;
|
|
@@ -756,6 +819,9 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
756
819
|
return panel.id;
|
|
757
820
|
}
|
|
758
821
|
|
|
822
|
+
const split = (direction: SpriteSplitDirection, id?: string) => addView(direction, id);
|
|
823
|
+
const openInNewTab = (id: string) => addView('within', id);
|
|
824
|
+
|
|
759
825
|
function closeSplit(id = active?.id) {
|
|
760
826
|
const panel = dockview.getPanel(id);
|
|
761
827
|
if (!multiView || !panel || !canCloseGroup(panel.api.group)) return false;
|
|
@@ -805,7 +871,8 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
805
871
|
if (!docked) return;
|
|
806
872
|
const panels: Record<string, PanelReference> = Object.create(null);
|
|
807
873
|
for (const [id, view] of views) {
|
|
808
|
-
panels[id] = {kind: 'sprite', name: targetName(view.target), stage: view.target.isStage, section: view.section
|
|
874
|
+
panels[id] = {kind: 'sprite', name: targetName(view.target), stage: view.target.isStage, section: view.section,
|
|
875
|
+
number: view.number};
|
|
809
876
|
}
|
|
810
877
|
if (dockview.getPanel(stagePanelId)) panels[stagePanelId] = {kind: 'stage'};
|
|
811
878
|
const transient = new Set<string>();
|
|
@@ -864,8 +931,9 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
864
931
|
if (reference.kind === 'sprite') {
|
|
865
932
|
const target = targets.find(item => item.isStage === reference.stage && targetName(item) === reference.name);
|
|
866
933
|
if (!target || id === stagePanelId || !sectionAvailable(reference.section)) return finishRestore();
|
|
867
|
-
resolvedSprites.set(id, {id, target, section: reference.section,
|
|
868
|
-
|
|
934
|
+
resolvedSprites.set(id, {id, target, section: reference.section, number: reference.number,
|
|
935
|
+
assets: createAssetSelections(target, locale)});
|
|
936
|
+
panels[id] = {id, contentComponent: 'sprite', params: {icon: getIcon(target)}};
|
|
869
937
|
} else if (reference.kind === 'stage') {
|
|
870
938
|
if (!stagePane || id !== stagePanelId) return finishRestore();
|
|
871
939
|
panels[id] = {id, title: stagePane.title, contentComponent: stagePanelId, renderer: 'always'};
|
|
@@ -881,6 +949,9 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
881
949
|
panels[id] = {id, title: documentPanelTitle(request), contentComponent: documentComponent, renderer: 'always'};
|
|
882
950
|
}
|
|
883
951
|
}
|
|
952
|
+
assignTabNumbers(resolvedSprites.values(), new Set([...targets.map(baseTitle),
|
|
953
|
+
...Object.values(panels).map(panel => panel.title)]));
|
|
954
|
+
for (const [id, view] of resolvedSprites) panels[id].title = tabTitle(view);
|
|
884
955
|
finishRestore();
|
|
885
956
|
syncing = true;
|
|
886
957
|
try {
|
|
@@ -923,10 +994,11 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
923
994
|
if (!available.has(view.target)) dockview.getPanel(id)?.api.close();
|
|
924
995
|
}
|
|
925
996
|
const represented = new Set<Target>();
|
|
997
|
+
assignTabNumbers(views.values());
|
|
926
998
|
for (const [id, view] of views) {
|
|
927
999
|
represented.add(view.target);
|
|
928
1000
|
const panel = dockview.getPanel(id);
|
|
929
|
-
const title = tabTitle(view
|
|
1001
|
+
const title = tabTitle(view);
|
|
930
1002
|
if (panel && panel.title !== title) panel.api.setTitle(title);
|
|
931
1003
|
const icon = getIcon(view.target);
|
|
932
1004
|
if (panel && panel.api.getParameters().icon !== icon) panel.api.updateParameters({icon});
|
|
@@ -995,7 +1067,8 @@ export function mountSpriteTabs<Snapshot>(root: HTMLElement, content: HTMLElemen
|
|
|
995
1067
|
vm.on('targetsUpdate', refresh);
|
|
996
1068
|
refresh();
|
|
997
1069
|
return {
|
|
998
|
-
select, openStage, closeStage, split, closeSplit, activateView,
|
|
1070
|
+
select, selectFromList, targetTabs, openStage, closeStage, split, closeSplit, activateView,
|
|
1071
|
+
setViewSection, syncActiveSection, refreshSurfaces,
|
|
999
1072
|
rename(id: string) {
|
|
1000
1073
|
const target = vm.runtime.targets.find(item => item.id === id);
|
|
1001
1074
|
if (target) openRenameDialog(target);
|
|
@@ -1312,8 +1385,15 @@ export function useSpriteTabs<Snapshot>({available, enabled, locale, ...props}:
|
|
|
1312
1385
|
}, [slots, props.activeSection]);
|
|
1313
1386
|
const japanese = /^ja(?:-|$)/i.test(locale);
|
|
1314
1387
|
const select = (id: string) => controller.current?.select(id);
|
|
1388
|
+
const listTabs = enabled && props.multiView ? {
|
|
1389
|
+
locale,
|
|
1390
|
+
list: (id?: string) => controller.current?.targetTabs(id) ?? [],
|
|
1391
|
+
select: (id?: string) => controller.current?.selectFromList(id),
|
|
1392
|
+
activate: (id: string) => controller.current?.activateView(id)
|
|
1393
|
+
} : null;
|
|
1315
1394
|
return {
|
|
1316
1395
|
controller,
|
|
1396
|
+
listTabs,
|
|
1317
1397
|
assetSelections: (enabled ? selection.assets : undefined) ?? defaultAssets,
|
|
1318
1398
|
context: enabled ? {
|
|
1319
1399
|
selectedId: selection.id, openLabel: japanese ? '開く' : 'Open', select, open: select,
|
package/src/standard-layout.ts
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
import {createLayout, createSplitter, splitAxis} from './index.ts';
|
|
2
2
|
import {createTargetList} from './targets.ts';
|
|
3
|
+
import type {DrawerViews} from './drawer-views.ts';
|
|
4
|
+
import {availableDrawerViews, createDrawerViewBar, hasDrawerBar, readDrawerView, writeDrawerView} from './drawer-views.ts';
|
|
5
|
+
|
|
6
|
+
export type {DrawerMenu, DrawerMenuRenderProps, DrawerRenderProps, DrawerView, DrawerViewId, DrawerViews,
|
|
7
|
+
HostDrawerViewId} from './drawer-views.ts';
|
|
3
8
|
|
|
4
9
|
const isJapanese = locale => /^ja(?:-|$)/i.test(locale);
|
|
5
10
|
const singleColumnTargetWidth = 108;
|
|
11
|
+
// Views other than the sprite list show file names and commit subjects, so the drawer opens wider for them.
|
|
12
|
+
const drawerViewWidth = 300;
|
|
13
|
+
const minimumDrawerViewWidth = 160;
|
|
6
14
|
const minimumStandardEditor = 380;
|
|
7
15
|
|
|
8
16
|
export function createStandardLayout(React, {styles, targetStyles, context, LayoutMenu}) {
|
|
@@ -10,12 +18,13 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
10
18
|
const SplitLayout = createLayout(React);
|
|
11
19
|
const Splitter = createSplitter(React);
|
|
12
20
|
const targets = createTargetList(React, targetStyles);
|
|
21
|
+
const DrawerViewBar = createDrawerViewBar(React, styles);
|
|
13
22
|
const targetSearch = React.createContext('');
|
|
14
23
|
const targetTools = React.createContext(null);
|
|
15
24
|
|
|
16
25
|
function StandardLayout({
|
|
17
26
|
enabled, splitter, windowLayout, stageActionEnabled, stageDrawer = false,
|
|
18
|
-
onPaletteModeChange, windowTools, Container, render, ...props
|
|
27
|
+
onPaletteModeChange, windowTools, Container, render, drawerViews = undefined as DrawerViews | undefined, ...props
|
|
19
28
|
}) {
|
|
20
29
|
const [showUndock, setShowUndock] = useState(false);
|
|
21
30
|
const [targetsPinned, setTargetsPinned] = useState(true);
|
|
@@ -23,8 +32,17 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
23
32
|
const [stageDrawerOpen, setStageDrawerOpen] = useState(false);
|
|
24
33
|
const [size, setSize] = useState(null);
|
|
25
34
|
const [targetRatio, setTargetRatio] = useState(null);
|
|
35
|
+
const [viewRatio, setViewRatio] = useState(null);
|
|
26
36
|
const [preferredStageWidth, setPreferredStageWidth] = useState(null);
|
|
27
37
|
const [stageActionMount, setStageActionMount] = useState(null);
|
|
38
|
+
const [preferredDrawerView, setPreferredDrawerView] = useState(() => readDrawerView(props.storage, props.storageKey));
|
|
39
|
+
const hostDrawerViews = availableDrawerViews(drawerViews);
|
|
40
|
+
// A view saved earlier comes back once the host supplies it again.
|
|
41
|
+
const drawerView = hostDrawerViews.some(view => view.id === preferredDrawerView) ? preferredDrawerView : 'sprites';
|
|
42
|
+
const selectDrawerView = view => {
|
|
43
|
+
setPreferredDrawerView(view);
|
|
44
|
+
writeDrawerView(props.storage, props.storageKey, view);
|
|
45
|
+
};
|
|
28
46
|
const body = useRef(null);
|
|
29
47
|
const plusLayout = enabled && !props.fullscreen;
|
|
30
48
|
const stageHidden = plusLayout && !showStage;
|
|
@@ -48,11 +66,16 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
48
66
|
const stageTools = stageActionEnabled &&
|
|
49
67
|
element('span', {className: styles.stageActionSlot, ref: setStageActionMount});
|
|
50
68
|
const bodyWidth = size?.width ?? 1024;
|
|
51
|
-
|
|
52
|
-
|
|
69
|
+
// The sprite list and the other views keep their own widths, so widening one leaves the other as it was.
|
|
70
|
+
const wideDrawer = plusLayout && drawerView !== 'sprites';
|
|
71
|
+
const targetSplit = plusLayout && splitter && size ? (wideDrawer ?
|
|
72
|
+
splitAxis(bodyWidth, viewRatio, drawerViewWidth, minimumDrawerViewWidth, minimumStandardEditor) :
|
|
73
|
+
splitAxis(bodyWidth, targetRatio, singleColumnTargetWidth, singleColumnTargetWidth, minimumStandardEditor)
|
|
53
74
|
) : null;
|
|
75
|
+
const fixedDrawerWidth = Math.max(singleColumnTargetWidth, Math.min(drawerViewWidth, Math.floor(bodyWidth / 2)));
|
|
54
76
|
const resizable = targetSplit && targetSplit.maximum > targetSplit.minimum;
|
|
55
|
-
const editorSpace = targetsPinned ?
|
|
77
|
+
const editorSpace = targetsPinned ?
|
|
78
|
+
(targetSplit?.second ?? bodyWidth - (wideDrawer ? fixedDrawerWidth : singleColumnTargetWidth)) : bodyWidth;
|
|
56
79
|
const maximumStageWidth = Math.max(1, Math.floor(Math.min(editorSpace - 24,
|
|
57
80
|
((size?.height ?? 640) - 112) * props.stageAspect)));
|
|
58
81
|
const defaultStageWidth = Math.min(maximumStageWidth, Math.floor(Math.min(props.defaultStageWidth, 360, bodyWidth / 2)));
|
|
@@ -105,13 +128,17 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
105
128
|
if (resizable) {
|
|
106
129
|
bodyStyle['--plus-target-width'] = `${targetSplit.first}px`;
|
|
107
130
|
bodyStyle['--plus-target-divider-width'] = `${size.width - targetSplit.available}px`;
|
|
131
|
+
} else if (wideDrawer) {
|
|
132
|
+
bodyStyle['--plus-target-width'] = `${fixedDrawerWidth}px`;
|
|
108
133
|
}
|
|
109
134
|
// The target list is on the physical left in both text directions.
|
|
110
135
|
const columnSplitter = targetsPinned && resizable ? element(Splitter, {
|
|
111
136
|
axis: 'columns', split: targetSplit,
|
|
112
|
-
label: japanese ? '
|
|
137
|
+
label: wideDrawer ? (japanese ? 'ドロワーと編集領域の幅' : 'Drawer and editor width') :
|
|
138
|
+
japanese ? 'スプライト一覧と編集領域の幅' : 'Sprite list and editor width',
|
|
113
139
|
className: `${styles.separator} ${styles.standardSeparator}`,
|
|
114
|
-
onChange:
|
|
140
|
+
onChange: wideDrawer ? setViewRatio : setTargetRatio,
|
|
141
|
+
onReset: () => (wideDrawer ? setViewRatio : setTargetRatio)(null)
|
|
115
142
|
}) : null;
|
|
116
143
|
return {
|
|
117
144
|
...shared,
|
|
@@ -146,7 +173,8 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
146
173
|
});
|
|
147
174
|
return element(context.Provider, {value: {
|
|
148
175
|
showUndock, plusLayout, targetsPinned, setTargetsPinned, stageHidden, setStageVisible: setShowStage, stageResize, stageActionMount,
|
|
149
|
-
stageDrawer: plusLayout && stageDrawer, setStageDrawerOpen, locale: props.locale
|
|
176
|
+
stageDrawer: plusLayout && stageDrawer, setStageDrawerOpen, locale: props.locale,
|
|
177
|
+
drawerViews, drawerView, selectDrawerView
|
|
150
178
|
}},
|
|
151
179
|
Container ? element(Container, {locale: props.locale}, layout) : layout);
|
|
152
180
|
}
|
|
@@ -256,13 +284,30 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
256
284
|
}
|
|
257
285
|
|
|
258
286
|
function TargetLayout({compact, render}) {
|
|
259
|
-
const {plusLayout, targetsPinned, locale} = useContext(context);
|
|
287
|
+
const {plusLayout, targetsPinned, locale, drawerViews, drawerView = 'sprites', selectDrawerView} = useContext(context);
|
|
260
288
|
const tools = useState(null);
|
|
261
289
|
const panel = render(plusLayout || compact);
|
|
262
|
-
|
|
290
|
+
if (!plusLayout) return panel;
|
|
291
|
+
const content = element(targetTools.Provider, {value: tools}, panel);
|
|
292
|
+
const drawer = children => element(EdgeDrawer, {
|
|
263
293
|
edge: 'left', pinned: targetsPinned,
|
|
264
294
|
label: isJapanese(locale) ? 'スプライト一覧を展開' : 'Reveal sprite list'
|
|
265
|
-
},
|
|
295
|
+
}, children);
|
|
296
|
+
// Without host views the drawer keeps the sprite list as its only, unwrapped content.
|
|
297
|
+
if (!hasDrawerBar(drawerViews)) return drawer(content);
|
|
298
|
+
const views = availableDrawerViews(drawerViews);
|
|
299
|
+
const active = views.find(view => view.id === drawerView);
|
|
300
|
+
return drawer(element(React.Fragment, null,
|
|
301
|
+
element(DrawerViewBar, {locale, views, agents: drawerViews.agents, selected: active ? active.id : 'sprites',
|
|
302
|
+
onSelect: selectDrawerView}),
|
|
303
|
+
// Pinning belongs to the drawer, so every view keeps the pin button the sprite list shows.
|
|
304
|
+
active && element('div', {className: styles.drawerViewTools},
|
|
305
|
+
active.tools?.({locale}),
|
|
306
|
+
element(DrawerPinButton, {label: isJapanese(locale) ? 'このパネルを固定表示' : 'Pin this panel'})),
|
|
307
|
+
// The GUI's target pane stays mounted, so its file inputs and library keep working while hidden.
|
|
308
|
+
element('div', {className: styles.drawerSprites, hidden: Boolean(active)}, content),
|
|
309
|
+
active && element('div', {className: styles.drawerViewContent, 'data-drawer-content': active.id},
|
|
310
|
+
active.render({locale}))));
|
|
266
311
|
}
|
|
267
312
|
|
|
268
313
|
function SpriteGrid(props) {
|
|
@@ -305,8 +350,18 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
305
350
|
) : fallback;
|
|
306
351
|
}
|
|
307
352
|
|
|
353
|
+
function DrawerPinButton({label}) {
|
|
354
|
+
const {targetsPinned, setTargetsPinned} = useContext(context);
|
|
355
|
+
return element('button', {type: 'button', className: styles.drawerPin, 'aria-label': label, 'aria-pressed': targetsPinned,
|
|
356
|
+
title: label, onClick: () => setTargetsPinned(value => !value)},
|
|
357
|
+
element('svg', {'aria-hidden': true, width: 14, height: 14, viewBox: '0 0 16 16',
|
|
358
|
+
fill: targetsPinned ? 'currentColor' : 'none', stroke: 'currentColor', strokeWidth: 1.2, strokeLinejoin: 'round'},
|
|
359
|
+
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'}),
|
|
360
|
+
!targetsPinned && element('path', {d: 'M2 2l12 12', strokeLinecap: 'round'})));
|
|
361
|
+
}
|
|
362
|
+
|
|
308
363
|
function useSpriteListTools() {
|
|
309
|
-
const {locale
|
|
364
|
+
const {locale} = useContext(context);
|
|
310
365
|
const [mount] = useContext(targetTools) ?? [];
|
|
311
366
|
const [searching, setSearching] = useState(false);
|
|
312
367
|
const [query, setQuery] = useState('');
|
|
@@ -331,12 +386,7 @@ export function createStandardLayout(React, {styles, targetStyles, context, Layo
|
|
|
331
386
|
element('svg', {'aria-hidden': true, width: 14, height: 14, viewBox: '0 0 16 16',
|
|
332
387
|
fill: 'none', stroke: 'currentColor', strokeWidth: 1.4, strokeLinecap: 'round'},
|
|
333
388
|
element('circle', {cx: 6.5, cy: 6.5, r: 4}), element('path', {d: 'm9.5 9.5 4 4'}))),
|
|
334
|
-
element(
|
|
335
|
-
title: pinLabel, onClick: () => setTargetsPinned(value => !value)},
|
|
336
|
-
element('svg', {'aria-hidden': true, width: 14, height: 14, viewBox: '0 0 16 16',
|
|
337
|
-
fill: targetsPinned ? 'currentColor' : 'none', stroke: 'currentColor', strokeWidth: 1.2, strokeLinejoin: 'round'},
|
|
338
|
-
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'}),
|
|
339
|
-
!targetsPinned && element('path', {d: 'M2 2l12 12', strokeLinecap: 'round'}))),
|
|
389
|
+
element(DrawerPinButton, {label: pinLabel}),
|
|
340
390
|
openAction),
|
|
341
391
|
searching && element('input', {type: 'search', className: styles.targetListSearch, 'aria-label': searchLabel,
|
|
342
392
|
ref: searchInput, placeholder: japanese ? '名前' : 'Name', value: query,
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type {IContextMenuItemRenderer} from 'dockview';
|
|
3
|
+
|
|
4
|
+
interface TargetTabs {
|
|
5
|
+
locale: string;
|
|
6
|
+
list(id?: string): readonly {id: string; title: string}[];
|
|
7
|
+
select(id?: string): void;
|
|
8
|
+
activate(id: string): void;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
interface MenuPrimitives {
|
|
12
|
+
MenuItem: React.ElementType;
|
|
13
|
+
SubMenu: React.ElementType;
|
|
14
|
+
menuClassName: string;
|
|
15
|
+
itemClassName: string;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const pencil = 'm4 16-1 5 5-1L21 7l-4-4L4 16Zm10-10 4 4';
|
|
19
|
+
const open = 'M13 4h7v7m0-7-9 9m-1-8H4v15h15v-6';
|
|
20
|
+
const iconClass = 'tw-plus-target-menu-icon';
|
|
21
|
+
const svgNamespace = 'http://www.w3.org/2000/svg';
|
|
22
|
+
const isJapanese = (locale: string) => /^ja(?:-|$)/i.test(locale);
|
|
23
|
+
export const spriteRenameLabel = (locale: string) => isJapanese(locale) ? 'スプライト名の変更' : 'Rename sprite';
|
|
24
|
+
|
|
25
|
+
export const SpriteTargetTabsContext = React.createContext<TargetTabs | null>(null);
|
|
26
|
+
|
|
27
|
+
export function createRenameMenuItem(document: Document, title: string, rename: (id: string) => void): IContextMenuItemRenderer {
|
|
28
|
+
const element = document.createElement('button');
|
|
29
|
+
element.type = 'button';
|
|
30
|
+
element.className = 'dv-context-menu-item tw-plus-target-menu-button';
|
|
31
|
+
element.setAttribute('role', 'menuitem');
|
|
32
|
+
const icon = document.createElementNS(svgNamespace, 'svg');
|
|
33
|
+
icon.setAttribute('class', iconClass);
|
|
34
|
+
icon.setAttribute('viewBox', '0 0 24 24');
|
|
35
|
+
icon.setAttribute('aria-hidden', 'true');
|
|
36
|
+
const path = document.createElementNS(svgNamespace, 'path');
|
|
37
|
+
path.setAttribute('d', pencil);
|
|
38
|
+
icon.append(path);
|
|
39
|
+
element.append(icon, title);
|
|
40
|
+
return {
|
|
41
|
+
element,
|
|
42
|
+
init(props) {
|
|
43
|
+
if (!('panel' in props)) return;
|
|
44
|
+
element.onclick = () => {
|
|
45
|
+
props.close();
|
|
46
|
+
rename(props.panel.id);
|
|
47
|
+
};
|
|
48
|
+
},
|
|
49
|
+
dispose() {
|
|
50
|
+
element.onclick = null;
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const itemLabel = (path: string, label: string) => React.createElement(React.Fragment, null,
|
|
56
|
+
React.createElement('svg', {className: iconClass, 'aria-hidden': true, viewBox: '0 0 24 24'},
|
|
57
|
+
React.createElement('path', {d: path})), label);
|
|
58
|
+
|
|
59
|
+
export function useTargetTabMenu() {
|
|
60
|
+
const tabs = React.useContext(SpriteTargetTabsContext);
|
|
61
|
+
const [shown, setShown] = React.useState<{id?: string; views: ReturnType<TargetTabs['list']>}>();
|
|
62
|
+
if (!tabs) return null;
|
|
63
|
+
return {
|
|
64
|
+
onShow(id?: string) {
|
|
65
|
+
// Read the live order even if the last move did not change the selection.
|
|
66
|
+
setShown({id, views: tabs.list(id)});
|
|
67
|
+
},
|
|
68
|
+
select: tabs.select,
|
|
69
|
+
render({MenuItem, SubMenu, menuClassName, itemClassName}: MenuPrimitives, id?: string,
|
|
70
|
+
rename?: (event: React.MouseEvent) => void) {
|
|
71
|
+
const views = shown?.id === id ? shown?.views ?? [] : [];
|
|
72
|
+
const label = itemLabel(open, isJapanese(tabs.locale) ? '開く' : 'Open');
|
|
73
|
+
const attributes = {className: itemClassName, 'data-tw-plus-menu-icon': ''};
|
|
74
|
+
const openItem = views.length > 1 ? React.createElement(SubMenu, {
|
|
75
|
+
title: React.createElement(React.Fragment, null, label,
|
|
76
|
+
React.createElement('span', {className: 'tw-plus-target-submenu-arrow', 'aria-hidden': true}, '›')),
|
|
77
|
+
className: `${menuClassName} tw-plus-target-submenu`,
|
|
78
|
+
attributes
|
|
79
|
+
}, views.map(view => React.createElement(MenuItem, {
|
|
80
|
+
key: view.id, attributes: {className: itemClassName},
|
|
81
|
+
onClick: (event: React.MouseEvent) => {
|
|
82
|
+
event.stopPropagation();
|
|
83
|
+
tabs.activate(view.id);
|
|
84
|
+
}
|
|
85
|
+
}, view.title))) : React.createElement(MenuItem, {
|
|
86
|
+
attributes,
|
|
87
|
+
onClick: (event: React.MouseEvent) => {
|
|
88
|
+
event.stopPropagation();
|
|
89
|
+
tabs.select(id);
|
|
90
|
+
}
|
|
91
|
+
}, label);
|
|
92
|
+
return {
|
|
93
|
+
open: openItem,
|
|
94
|
+
rename: rename && React.createElement(MenuItem, {attributes, onClick: rename},
|
|
95
|
+
itemLabel(pencil, spriteRenameLabel(tabs.locale)))
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
};
|
|
99
|
+
}
|
package/src/workspace-layout.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type {DocumentPanelRequest} from './document-workspace.ts';
|
|
|
5
5
|
type Grid = SerializedDockview['grid'];
|
|
6
6
|
type Node = Grid['root'];
|
|
7
7
|
export type PanelReference =
|
|
8
|
-
| {kind: 'sprite'; name: string; stage: boolean; section: number}
|
|
8
|
+
| {kind: 'sprite'; name: string; stage: boolean; section: number; number?: number}
|
|
9
9
|
| {kind: 'stage'}
|
|
10
10
|
| ({kind: 'document'} & DocumentPanelRequest['reference']);
|
|
11
11
|
|
|
@@ -168,8 +168,11 @@ export function readWorkspaceLayout(raw: string, project: string): WorkspaceLayo
|
|
|
168
168
|
const panel = input.panels[id];
|
|
169
169
|
if (!Object.hasOwn(input.panels, id) || !record(panel)) return;
|
|
170
170
|
if (panel.kind === 'sprite' && validId(panel.name) && typeof panel.stage === 'boolean' &&
|
|
171
|
-
typeof panel.section === 'number' && Number.isInteger(panel.section) && panel.section >= 0 && panel.section <=
|
|
172
|
-
|
|
171
|
+
typeof panel.section === 'number' && Number.isInteger(panel.section) && panel.section >= 0 && panel.section <= 4) {
|
|
172
|
+
const number = panel.number;
|
|
173
|
+
if (number !== undefined && (typeof number !== 'number' || !Number.isSafeInteger(number) || number < 2)) return;
|
|
174
|
+
panels[id] = {kind: 'sprite', name: panel.name, stage: panel.stage, section: panel.section,
|
|
175
|
+
...(typeof number === 'number' && {number})};
|
|
173
176
|
} else if (panel.kind === 'stage' && !hasStage) {
|
|
174
177
|
hasStage = true;
|
|
175
178
|
panels[id] = {kind: 'stage'};
|