@kubohiroya/turbowarp-plus-editor-workbench 0.20.0 → 0.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extension-file-menu.d.ts +2 -0
- package/dist/extension-file-menu.js +4 -1
- package/dist/project-file-dialogs.d.ts +9 -0
- package/dist/project-file-dialogs.js +6 -3
- package/dist/project-file-menu.js +8 -3
- package/package.json +1 -1
- package/src/extension-file-menu.ts +4 -1
- package/src/project-file-dialogs.ts +15 -3
- package/src/project-file-menu.tsx +10 -3
|
@@ -24,7 +24,10 @@ const glyphs = {
|
|
|
24
24
|
save: 'M4 3h13l3 3v15H4z M8 3v6h8V3 M8 21v-7h8v7',
|
|
25
25
|
copy: 'M8 8h12v13H8z M16 8V3H3v13h5',
|
|
26
26
|
remix: 'M18 8a7 7 0 1 0 0 8 M18 3v5h-5 M18 8l2-2',
|
|
27
|
-
|
|
27
|
+
// An SB3 file is one file: a page with an arrow, set apart from the folder of Open Folder….
|
|
28
|
+
open: 'M5 3h9l5 5v13H5z M14 3v5h5 M12 18v-7 M9 14l3-3 3 3',
|
|
29
|
+
'project-folder-open': 'M3 6h7l2 2h9l-2 11H3z M3 11h16',
|
|
30
|
+
'project-folder-open-browser': 'M4 4h16a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1z M3 9h18 M6 6.5h.01 M8.5 6.5h.01 M11 6.5h.01',
|
|
28
31
|
'save-as': 'M4 3h13l3 3v15H4z M8 3v6h8V3 M9 17h6 M12 14v6',
|
|
29
32
|
download: 'M12 3v12 M7 10l5 5 5-5 M4 17v4h16v-4',
|
|
30
33
|
package: 'm12 3 8 4v10l-8 4-8-4V7z M4 7l8 4 8-4 M12 11v10 M8 5l8 4',
|
|
@@ -2,6 +2,9 @@ import type { CreationInteraction, GitHubCreationAccount, GitHubRepositoryDraft,
|
|
|
2
2
|
export type Action = () => void;
|
|
3
3
|
export type FolderActions = {
|
|
4
4
|
open: Action;
|
|
5
|
+
openBrowser?: Action;
|
|
6
|
+
/** Whether Open can pick a folder on the device; `false` in browsers without the folder picker (Safari, Firefox). */
|
|
7
|
+
deviceFolders?: boolean;
|
|
5
8
|
save?: Action;
|
|
6
9
|
detach: Action;
|
|
7
10
|
};
|
|
@@ -18,6 +21,12 @@ export type SaveAsRequest = {
|
|
|
18
21
|
export interface SaveAsFormOptions {
|
|
19
22
|
openCommit?: Action;
|
|
20
23
|
folder?: {
|
|
24
|
+
/**
|
|
25
|
+
* `browser` keeps the new folder in the browser, as the project folder package does where there is no folder
|
|
26
|
+
* picker. The form then offers the folder format without the picker, keeps the name for the new folder, and
|
|
27
|
+
* leaves out the overwrite warning, since such a folder is always new. Defaults to `device`.
|
|
28
|
+
*/
|
|
29
|
+
location?: 'device' | 'browser';
|
|
21
30
|
overwriteWarning?: string;
|
|
22
31
|
github?: {
|
|
23
32
|
connectForCreation(interaction: CreationInteraction): Promise<GitHubCreationAccount | null>;
|
|
@@ -222,7 +222,8 @@ export function renderSaveAsForm(document, locale, storage, save, close, { folde
|
|
|
222
222
|
appendOption(format, label('SB3(現在の格納方式)', 'SB3 (current storage settings)'), 'current');
|
|
223
223
|
appendOption(format, label('SB3(設定対象の台本・素材を同梱)', 'SB3 (embed configured scripts and assets)'), 'embedded');
|
|
224
224
|
const picker = document.defaultView?.showDirectoryPicker;
|
|
225
|
-
const
|
|
225
|
+
const inBrowser = folder?.location === 'browser';
|
|
226
|
+
const folderAvailable = folder && (inBrowser || typeof picker === 'function');
|
|
226
227
|
if (folderAvailable)
|
|
227
228
|
appendOption(format, label('プロジェクトフォルダ', 'Project folder'), 'folder');
|
|
228
229
|
appendField(fields, label('保存形式', 'Save format'), format);
|
|
@@ -333,7 +334,8 @@ export function renderSaveAsForm(document, locale, storage, save, close, { folde
|
|
|
333
334
|
const refresh = () => {
|
|
334
335
|
const reviewing = confirmedDraft !== null || task !== null;
|
|
335
336
|
const creation = selectedGitHub();
|
|
336
|
-
|
|
337
|
+
// A folder on the device takes its name from the picked folder; a folder in the browser keeps this name.
|
|
338
|
+
const localFolder = savingFolder() && !creation && !inBrowser;
|
|
337
339
|
overwriteWarning.hidden = !localFolder;
|
|
338
340
|
fields.hidden = reviewing;
|
|
339
341
|
review.hidden = !reviewing;
|
|
@@ -355,7 +357,8 @@ export function renderSaveAsForm(document, locale, storage, save, close, { folde
|
|
|
355
357
|
pending.hidden = reviewing || !pending.childElementCount;
|
|
356
358
|
submit.textContent = task ? actionText(task.phase) : reviewing ? label('リポジトリを作成', 'Create Repository') : creation ?
|
|
357
359
|
(creation.connected ? label('作成内容を確認', 'Review Repository') : label('GitHub へ接続…', 'Connect to GitHub…')) :
|
|
358
|
-
|
|
360
|
+
savingFolder() && inBrowser ? label('ブラウザー内に保存…', 'Save in This Browser…') :
|
|
361
|
+
(savingFolder() || storage.pick ? label('保存先を選ぶ…', 'Choose Where to Save…') : label('保存', 'Save'));
|
|
359
362
|
};
|
|
360
363
|
const loadPending = async () => {
|
|
361
364
|
if (!publication)
|
|
@@ -52,10 +52,10 @@ export default function ProjectFileMenu({ locale, MenuItem, MenuSection, close,
|
|
|
52
52
|
React.useLayoutEffect(() => workspace?.subscribeSave(redraw), [workspace]);
|
|
53
53
|
const tabShortcut = workspace?.saveScope === 'tab';
|
|
54
54
|
const mac = isMacPlatform();
|
|
55
|
-
const item = ([command, label, action, showShortcut]) => {
|
|
55
|
+
const item = ([command, label, action, showShortcut, unavailable]) => {
|
|
56
56
|
const run = action && (() => { close(); action(); });
|
|
57
57
|
return React.createElement(MenuItem, { key: command, command: command, onClick: run },
|
|
58
|
-
React.createElement("span", { className: "tw-project-file-menu__item", role: "button", "aria-disabled": !run || undefined, tabIndex: run ? 0 : -1, "aria-keyshortcuts": showShortcut ? (mac ? 'Meta+S' : 'Control+S') : undefined, style: !run ? { opacity: 0.5, cursor: 'default' } : undefined, onKeyDown: event => {
|
|
58
|
+
React.createElement("span", { className: "tw-project-file-menu__item", role: "button", "aria-disabled": !run || undefined, tabIndex: run ? 0 : -1, title: !run ? unavailable : undefined, "aria-keyshortcuts": showShortcut ? (mac ? 'Meta+S' : 'Control+S') : undefined, style: !run ? { opacity: 0.5, cursor: 'default' } : undefined, onKeyDown: event => {
|
|
59
59
|
if (!run || (event.key !== 'Enter' && event.key !== ' '))
|
|
60
60
|
return;
|
|
61
61
|
event.preventDefault();
|
|
@@ -71,7 +71,12 @@ export default function ProjectFileMenu({ locale, MenuItem, MenuSection, close,
|
|
|
71
71
|
e.newWindow && item(['window', ja ? '新しいウィンドウ' : 'New Window', e.newWindow]),
|
|
72
72
|
React.createElement(MenuSection, null,
|
|
73
73
|
item(['open', ja ? 'SB3ファイルを開く…' : 'Open SB3 File…', e.open]),
|
|
74
|
-
e.folder && item(['project-folder-open', ja ? '
|
|
74
|
+
e.folder && item(['project-folder-open', ja ? 'フォルダを開く…' : 'Open Folder…',
|
|
75
|
+
e.folder.deviceFolders === false ? undefined : e.folder.open, false,
|
|
76
|
+
ja ? 'このブラウザーでは端末のフォルダを開けません。Chrome か Edge を使うか、ブラウザーに保存したフォルダを開いてください。' :
|
|
77
|
+
'This browser cannot open folders on your device. Use Chrome or Edge, or open a folder saved in this browser.']),
|
|
78
|
+
e.folder?.openBrowser && item(['project-folder-open-browser',
|
|
79
|
+
ja ? 'ブラウザーに保存したフォルダを開く…' : 'Open Folder Saved in This Browser…', e.folder.openBrowser]),
|
|
75
80
|
e.git,
|
|
76
81
|
e.externalYaml),
|
|
77
82
|
React.createElement(MenuSection, null,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kubohiroya/turbowarp-plus-editor-workbench",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.22.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",
|
|
@@ -34,7 +34,10 @@ const glyphs = {
|
|
|
34
34
|
save: 'M4 3h13l3 3v15H4z M8 3v6h8V3 M8 21v-7h8v7',
|
|
35
35
|
copy: 'M8 8h12v13H8z M16 8V3H3v13h5',
|
|
36
36
|
remix: 'M18 8a7 7 0 1 0 0 8 M18 3v5h-5 M18 8l2-2',
|
|
37
|
-
|
|
37
|
+
// An SB3 file is one file: a page with an arrow, set apart from the folder of Open Folder….
|
|
38
|
+
open: 'M5 3h9l5 5v13H5z M14 3v5h5 M12 18v-7 M9 14l3-3 3 3',
|
|
39
|
+
'project-folder-open': 'M3 6h7l2 2h9l-2 11H3z M3 11h16',
|
|
40
|
+
'project-folder-open-browser': 'M4 4h16a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1z M3 9h18 M6 6.5h.01 M8.5 6.5h.01 M11 6.5h.01',
|
|
38
41
|
'save-as': 'M4 3h13l3 3v15H4z M8 3v6h8V3 M9 17h6 M12 14v6',
|
|
39
42
|
download: 'M12 3v12 M7 10l5 5 5-5 M4 17v4h16v-4',
|
|
40
43
|
package: 'm12 3 8 4v10l-8 4-8-4V7z M4 7l8 4 8-4 M12 11v10 M8 5l8 4',
|
|
@@ -3,7 +3,10 @@ import type {CreationInteraction, GitHubCreationAccount, GitHubRepositoryDraft,
|
|
|
3
3
|
RepositoryCreationProgress, RepositoryReceipt} from '@kubohiroya/turbowarp-plus-editor-git/project-repository-creation';
|
|
4
4
|
|
|
5
5
|
export type Action = () => void;
|
|
6
|
-
|
|
6
|
+
// `openBrowser` opens a folder kept in the browser (OPFS), where the host offers one.
|
|
7
|
+
export type FolderActions = {open: Action; openBrowser?: Action;
|
|
8
|
+
/** Whether Open can pick a folder on the device; `false` in browsers without the folder picker (Safari, Firefox). */
|
|
9
|
+
deviceFolders?: boolean; save?: Action; detach: Action};
|
|
7
10
|
export type SaveFormat = 'current' | 'embedded' | 'folder';
|
|
8
11
|
type Serialize = <T>(run: () => T) => T;
|
|
9
12
|
|
|
@@ -14,6 +17,12 @@ export type SaveAsRequest =
|
|
|
14
17
|
export interface SaveAsFormOptions {
|
|
15
18
|
openCommit?: Action;
|
|
16
19
|
folder?: {
|
|
20
|
+
/**
|
|
21
|
+
* `browser` keeps the new folder in the browser, as the project folder package does where there is no folder
|
|
22
|
+
* picker. The form then offers the folder format without the picker, keeps the name for the new folder, and
|
|
23
|
+
* leaves out the overwrite warning, since such a folder is always new. Defaults to `device`.
|
|
24
|
+
*/
|
|
25
|
+
location?: 'device' | 'browser';
|
|
17
26
|
overwriteWarning?: string;
|
|
18
27
|
github?: {
|
|
19
28
|
// The host can reuse a current session or open sign-in. The form retains its draft either way.
|
|
@@ -270,7 +279,8 @@ export function renderSaveAsForm(document: Document, locale: string, storage: Pr
|
|
|
270
279
|
appendOption(format, label('SB3(現在の格納方式)', 'SB3 (current storage settings)'), 'current');
|
|
271
280
|
appendOption(format, label('SB3(設定対象の台本・素材を同梱)', 'SB3 (embed configured scripts and assets)'), 'embedded');
|
|
272
281
|
const picker = (document.defaultView as (Window & {showDirectoryPicker?: unknown}) | null)?.showDirectoryPicker;
|
|
273
|
-
const
|
|
282
|
+
const inBrowser = folder?.location === 'browser';
|
|
283
|
+
const folderAvailable = folder && (inBrowser || typeof picker === 'function');
|
|
274
284
|
if (folderAvailable) appendOption(format, label('プロジェクトフォルダ', 'Project folder'), 'folder');
|
|
275
285
|
appendField(fields, label('保存形式', 'Save format'), format);
|
|
276
286
|
|
|
@@ -386,7 +396,8 @@ export function renderSaveAsForm(document: Document, locale: string, storage: Pr
|
|
|
386
396
|
const refresh = () => {
|
|
387
397
|
const reviewing = confirmedDraft !== null || task !== null;
|
|
388
398
|
const creation = selectedGitHub();
|
|
389
|
-
|
|
399
|
+
// A folder on the device takes its name from the picked folder; a folder in the browser keeps this name.
|
|
400
|
+
const localFolder = savingFolder() && !creation && !inBrowser;
|
|
390
401
|
overwriteWarning.hidden = !localFolder;
|
|
391
402
|
fields.hidden = reviewing;
|
|
392
403
|
review.hidden = !reviewing;
|
|
@@ -408,6 +419,7 @@ export function renderSaveAsForm(document: Document, locale: string, storage: Pr
|
|
|
408
419
|
pending.hidden = reviewing || !pending.childElementCount;
|
|
409
420
|
submit.textContent = task ? actionText(task.phase) : reviewing ? label('リポジトリを作成', 'Create Repository') : creation ?
|
|
410
421
|
(creation.connected ? label('作成内容を確認', 'Review Repository') : label('GitHub へ接続…', 'Connect to GitHub…')) :
|
|
422
|
+
savingFolder() && inBrowser ? label('ブラウザー内に保存…', 'Save in This Browser…') :
|
|
411
423
|
(savingFolder() || storage.pick ? label('保存先を選ぶ…', 'Choose Where to Save…') : label('保存', 'Save'));
|
|
412
424
|
};
|
|
413
425
|
const loadPending = async () => {
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import {isMacPlatform} from '@kubohiroya/turbowarp-plus-editor-project-model/project-search-connections';
|
|
3
3
|
import type {Action, FolderActions, ProjectFileStorage} from './project-file-dialogs.js';
|
|
4
4
|
|
|
5
|
-
type Entry = [command: string, label: string, action: Action | undefined, showShortcut?: boolean];
|
|
5
|
+
type Entry = [command: string, label: string, action: Action | undefined, showShortcut?: boolean, unavailable?: string];
|
|
6
6
|
interface SaveWorkspace {
|
|
7
7
|
saveScope: 'project' | 'tab';
|
|
8
8
|
canSaveActive: boolean;
|
|
@@ -92,10 +92,11 @@ export default function ProjectFileMenu({locale, MenuItem, MenuSection, close, e
|
|
|
92
92
|
React.useLayoutEffect(() => workspace?.subscribeSave(redraw), [workspace]);
|
|
93
93
|
const tabShortcut = workspace?.saveScope === 'tab';
|
|
94
94
|
const mac = isMacPlatform();
|
|
95
|
-
const item = ([command, label, action, showShortcut]: Entry) => {
|
|
95
|
+
const item = ([command, label, action, showShortcut, unavailable]: Entry) => {
|
|
96
96
|
const run = action && (() => {close(); action();});
|
|
97
97
|
return <MenuItem key={command} command={command} onClick={run}>
|
|
98
98
|
<span className="tw-project-file-menu__item" role="button" aria-disabled={!run || undefined} tabIndex={run ? 0 : -1}
|
|
99
|
+
title={!run ? unavailable : undefined}
|
|
99
100
|
aria-keyshortcuts={showShortcut ? (mac ? 'Meta+S' : 'Control+S') : undefined}
|
|
100
101
|
style={!run ? {opacity: 0.5, cursor: 'default'} : undefined} onKeyDown={event => {
|
|
101
102
|
if (!run || (event.key !== 'Enter' && event.key !== ' ')) return;
|
|
@@ -111,7 +112,13 @@ export default function ProjectFileMenu({locale, MenuItem, MenuSection, close, e
|
|
|
111
112
|
{e.newWindow && item(['window', ja ? '新しいウィンドウ' : 'New Window', e.newWindow])}
|
|
112
113
|
<MenuSection>
|
|
113
114
|
{item(['open', ja ? 'SB3ファイルを開く…' : 'Open SB3 File…', e.open])}
|
|
114
|
-
{
|
|
115
|
+
{/* Safari and Firefox cannot pick folders on the device; the browser's folders have their own item. */}
|
|
116
|
+
{e.folder && item(['project-folder-open', ja ? 'フォルダを開く…' : 'Open Folder…',
|
|
117
|
+
e.folder.deviceFolders === false ? undefined : e.folder.open, false,
|
|
118
|
+
ja ? 'このブラウザーでは端末のフォルダを開けません。Chrome か Edge を使うか、ブラウザーに保存したフォルダを開いてください。' :
|
|
119
|
+
'This browser cannot open folders on your device. Use Chrome or Edge, or open a folder saved in this browser.'])}
|
|
120
|
+
{e.folder?.openBrowser && item(['project-folder-open-browser',
|
|
121
|
+
ja ? 'ブラウザーに保存したフォルダを開く…' : 'Open Folder Saved in This Browser…', e.folder.openBrowser])}
|
|
115
122
|
{e.git}
|
|
116
123
|
{e.externalYaml}
|
|
117
124
|
</MenuSection>
|