@multiplatform.one/backoffice 7.63.4 → 7.65.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/cjs/chrome/BackofficeAwesomebar.cjs +3 -19
- package/dist/cjs/chrome/BackofficeAwesomebar.native.js +3 -20
- package/dist/cjs/chrome/BackofficeAwesomebar.native.js.map +1 -1
- package/dist/cjs/chrome/CommandPalette.cjs +6 -23
- package/dist/cjs/chrome/CommandPalette.native.js +6 -24
- package/dist/cjs/chrome/CommandPalette.native.js.map +1 -1
- package/dist/cjs/chrome/help-shortcuts-dialog.cjs +7 -43
- package/dist/cjs/chrome/help-shortcuts-dialog.native.js +6 -46
- package/dist/cjs/chrome/help-shortcuts-dialog.native.js.map +1 -1
- package/dist/cjs/list/DoctypeListScreen.cjs +10 -4
- package/dist/cjs/list/DoctypeListScreen.native.js +12 -4
- package/dist/cjs/list/DoctypeListScreen.native.js.map +1 -1
- package/dist/cjs/shell/BackofficeShell.cjs +37 -2
- package/dist/cjs/shell/BackofficeShell.native.js +43 -2
- package/dist/cjs/shell/BackofficeShell.native.js.map +1 -1
- package/dist/cjs/shell/shellTopBarSlot.cjs +65 -9
- package/dist/cjs/shell/shellTopBarSlot.native.js +78 -9
- package/dist/cjs/shell/shellTopBarSlot.native.js.map +1 -1
- package/dist/esm/chrome/BackofficeAwesomebar.mjs +4 -20
- package/dist/esm/chrome/BackofficeAwesomebar.mjs.map +1 -1
- package/dist/esm/chrome/BackofficeAwesomebar.native.js +4 -21
- package/dist/esm/chrome/BackofficeAwesomebar.native.js.map +1 -1
- package/dist/esm/chrome/CommandPalette.mjs +7 -24
- package/dist/esm/chrome/CommandPalette.mjs.map +1 -1
- package/dist/esm/chrome/CommandPalette.native.js +7 -25
- package/dist/esm/chrome/CommandPalette.native.js.map +1 -1
- package/dist/esm/chrome/help-shortcuts-dialog.mjs +9 -45
- package/dist/esm/chrome/help-shortcuts-dialog.mjs.map +1 -1
- package/dist/esm/chrome/help-shortcuts-dialog.native.js +8 -48
- package/dist/esm/chrome/help-shortcuts-dialog.native.js.map +1 -1
- package/dist/esm/list/DoctypeListScreen.mjs +11 -5
- package/dist/esm/list/DoctypeListScreen.mjs.map +1 -1
- package/dist/esm/list/DoctypeListScreen.native.js +13 -5
- package/dist/esm/list/DoctypeListScreen.native.js.map +1 -1
- package/dist/esm/shell/BackofficeShell.mjs +37 -2
- package/dist/esm/shell/BackofficeShell.mjs.map +1 -1
- package/dist/esm/shell/BackofficeShell.native.js +43 -2
- package/dist/esm/shell/BackofficeShell.native.js.map +1 -1
- package/dist/esm/shell/shellTopBarSlot.mjs +66 -11
- package/dist/esm/shell/shellTopBarSlot.mjs.map +1 -1
- package/dist/esm/shell/shellTopBarSlot.native.js +79 -11
- package/dist/esm/shell/shellTopBarSlot.native.js.map +1 -1
- package/dist/jsx/chrome/BackofficeAwesomebar.mjs +4 -20
- package/dist/jsx/chrome/BackofficeAwesomebar.mjs.map +1 -1
- package/dist/jsx/chrome/BackofficeAwesomebar.native.js +3 -20
- package/dist/jsx/chrome/BackofficeAwesomebar.native.js.map +1 -1
- package/dist/jsx/chrome/CommandPalette.mjs +7 -24
- package/dist/jsx/chrome/CommandPalette.mjs.map +1 -1
- package/dist/jsx/chrome/CommandPalette.native.js +6 -24
- package/dist/jsx/chrome/CommandPalette.native.js.map +1 -1
- package/dist/jsx/chrome/help-shortcuts-dialog.mjs +9 -45
- package/dist/jsx/chrome/help-shortcuts-dialog.mjs.map +1 -1
- package/dist/jsx/chrome/help-shortcuts-dialog.native.js +6 -46
- package/dist/jsx/chrome/help-shortcuts-dialog.native.js.map +1 -1
- package/dist/jsx/list/DoctypeListScreen.mjs +11 -5
- package/dist/jsx/list/DoctypeListScreen.mjs.map +1 -1
- package/dist/jsx/list/DoctypeListScreen.native.js +12 -4
- package/dist/jsx/list/DoctypeListScreen.native.js.map +1 -1
- package/dist/jsx/shell/BackofficeShell.mjs +37 -2
- package/dist/jsx/shell/BackofficeShell.mjs.map +1 -1
- package/dist/jsx/shell/BackofficeShell.native.js +43 -2
- package/dist/jsx/shell/BackofficeShell.native.js.map +1 -1
- package/dist/jsx/shell/shellTopBarSlot.mjs +66 -11
- package/dist/jsx/shell/shellTopBarSlot.mjs.map +1 -1
- package/dist/jsx/shell/shellTopBarSlot.native.js +78 -9
- package/dist/jsx/shell/shellTopBarSlot.native.js.map +1 -1
- package/package.json +12 -12
- package/src/chrome/BackofficeAwesomebar.tsx +2 -26
- package/src/chrome/CommandPalette.stories.tsx +1 -7
- package/src/chrome/CommandPalette.tsx +4 -20
- package/src/chrome/help-shortcuts-dialog.tsx +9 -51
- package/src/desk/Desk.stories.tsx +1 -7
- package/src/desk/DeskSurface.stories.tsx +1 -7
- package/src/formBuilder/FormBuilderScreen.stories.tsx +2 -6
- package/src/list/DoctypeListScreen.compactHead.screen.spec.tsx +13 -0
- package/src/list/DoctypeListScreen.tsx +18 -8
- package/src/shell/BackofficeShell.tsx +49 -5
- package/src/shell/NotFoundScreen.stories.tsx +1 -7
- package/src/shell/shellTopBarSlot.spec.tsx +131 -0
- package/src/shell/shellTopBarSlot.tsx +109 -10
- package/src/views/DoctypeViewScreen.stories.tsx +1 -7
- package/types/chrome/BackofficeAwesomebar.d.ts.map +1 -1
- package/types/chrome/CommandPalette.d.ts.map +1 -1
- package/types/chrome/help-shortcuts-dialog.d.ts.map +1 -1
- package/types/list/DoctypeListScreen.d.ts.map +1 -1
- package/types/shell/BackofficeShell.d.ts.map +1 -1
- package/types/shell/shellTopBarSlot.d.ts +36 -2
- package/types/shell/shellTopBarSlot.d.ts.map +1 -1
|
@@ -25,6 +25,7 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
25
25
|
var shellTopBarSlot_exports = {};
|
|
26
26
|
__export(shellTopBarSlot_exports, {
|
|
27
27
|
ShellTopBarSlotProvider: () => ShellTopBarSlotProvider,
|
|
28
|
+
bannerHoldsAction: () => bannerHoldsAction,
|
|
28
29
|
useShellTopBarAction: () => useShellTopBarAction,
|
|
29
30
|
useShellTopBarSlotState: () => useShellTopBarSlotState
|
|
30
31
|
});
|
|
@@ -32,16 +33,83 @@ module.exports = __toCommonJS(shellTopBarSlot_exports);
|
|
|
32
33
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
33
34
|
var import_react = require("react");
|
|
34
35
|
var ShellTopBarSlotContext = /* @__PURE__ */(0, import_react.createContext)(null);
|
|
36
|
+
var fitTolerancePx = 0.5;
|
|
37
|
+
function bannerHoldsAction(param) {
|
|
38
|
+
var {
|
|
39
|
+
shown,
|
|
40
|
+
titleNatural,
|
|
41
|
+
titleAvailable,
|
|
42
|
+
actionCost
|
|
43
|
+
} = param;
|
|
44
|
+
if (shown) return titleNatural <= titleAvailable + fitTolerancePx;
|
|
45
|
+
if (actionCost === void 0) return false;
|
|
46
|
+
return titleNatural <= titleAvailable - actionCost + fitTolerancePx;
|
|
47
|
+
}
|
|
35
48
|
function useShellTopBarSlotState() {
|
|
36
|
-
var [action,
|
|
49
|
+
var [action, setActionState] = (0, import_react.useState)(null);
|
|
50
|
+
var [held, setHeld] = (0, import_react.useState)(true);
|
|
51
|
+
var [widths, setWidths] = (0, import_react.useState)({});
|
|
52
|
+
var hasAction = action != null;
|
|
53
|
+
var setAction = (0, import_react.useCallback)(function (next) {
|
|
54
|
+
setActionState(next);
|
|
55
|
+
if (next == null) {
|
|
56
|
+
setHeld(true);
|
|
57
|
+
setWidths(function (current) {
|
|
58
|
+
return {
|
|
59
|
+
...current,
|
|
60
|
+
trailingWith: void 0
|
|
61
|
+
};
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}, []);
|
|
65
|
+
var record = (0, import_react.useCallback)(function (key) {
|
|
66
|
+
return function (width) {
|
|
67
|
+
return setWidths(function (current) {
|
|
68
|
+
return current[key] === width ? current : {
|
|
69
|
+
...current,
|
|
70
|
+
[key]: width
|
|
71
|
+
};
|
|
72
|
+
});
|
|
73
|
+
};
|
|
74
|
+
}, []);
|
|
75
|
+
var measure = (0, import_react.useMemo)(function () {
|
|
76
|
+
return {
|
|
77
|
+
titleNatural: record("titleNatural"),
|
|
78
|
+
titleAvailable: record("titleAvailable"),
|
|
79
|
+
trailing: function trailing(width) {
|
|
80
|
+
return record(hasAction && held ? "trailingWith" : "trailingWithout")(width);
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
}, [record, hasAction, held]);
|
|
84
|
+
(0, import_react.useLayoutEffect)(function () {
|
|
85
|
+
if (!hasAction) return;
|
|
86
|
+
var {
|
|
87
|
+
titleNatural,
|
|
88
|
+
titleAvailable,
|
|
89
|
+
trailingWith,
|
|
90
|
+
trailingWithout
|
|
91
|
+
} = widths;
|
|
92
|
+
if (titleNatural === void 0 || titleAvailable === void 0) return;
|
|
93
|
+
var actionCost = trailingWith !== void 0 && trailingWithout !== void 0 ? trailingWith - trailingWithout : void 0;
|
|
94
|
+
var next = bannerHoldsAction({
|
|
95
|
+
shown: held,
|
|
96
|
+
titleNatural,
|
|
97
|
+
titleAvailable,
|
|
98
|
+
actionCost
|
|
99
|
+
});
|
|
100
|
+
if (next !== held) setHeld(next);
|
|
101
|
+
}, [hasAction, held, widths]);
|
|
37
102
|
var value = (0, import_react.useMemo)(function () {
|
|
38
103
|
return {
|
|
39
|
-
setAction
|
|
104
|
+
setAction,
|
|
105
|
+
held
|
|
40
106
|
};
|
|
41
|
-
}, []);
|
|
107
|
+
}, [setAction, held]);
|
|
42
108
|
return {
|
|
43
109
|
action,
|
|
44
|
-
|
|
110
|
+
held: hasAction && held,
|
|
111
|
+
value,
|
|
112
|
+
measure
|
|
45
113
|
};
|
|
46
114
|
}
|
|
47
115
|
function ShellTopBarSlotProvider(param) {
|
|
@@ -56,15 +124,16 @@ function ShellTopBarSlotProvider(param) {
|
|
|
56
124
|
}
|
|
57
125
|
function useShellTopBarAction(action) {
|
|
58
126
|
var slot = (0, import_react.useContext)(ShellTopBarSlotContext);
|
|
127
|
+
var setAction = slot === null || slot === void 0 ? void 0 : slot.setAction;
|
|
59
128
|
(0, import_react.useLayoutEffect)(function () {
|
|
60
|
-
|
|
129
|
+
setAction === null || setAction === void 0 ? void 0 : setAction(action);
|
|
61
130
|
});
|
|
62
131
|
(0, import_react.useLayoutEffect)(function () {
|
|
63
|
-
if (!
|
|
132
|
+
if (!setAction) return;
|
|
64
133
|
return function () {
|
|
65
|
-
return
|
|
134
|
+
return setAction(null);
|
|
66
135
|
};
|
|
67
|
-
}, [
|
|
68
|
-
return slot !== null;
|
|
136
|
+
}, [setAction]);
|
|
137
|
+
return slot !== null && slot.held;
|
|
69
138
|
}
|
|
70
139
|
//# sourceMappingURL=shellTopBarSlot.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","shellTopBarSlot_exports","ShellTopBarSlotProvider","useShellTopBarAction","useShellTopBarSlotState","module","exports","import_jsx_runtime","require","import_react","ShellTopBarSlotContext","createContext","action","
|
|
1
|
+
{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","shellTopBarSlot_exports","ShellTopBarSlotProvider","bannerHoldsAction","useShellTopBarAction","useShellTopBarSlotState","module","exports","import_jsx_runtime","require","import_react","ShellTopBarSlotContext","createContext","fitTolerancePx","param","shown","titleNatural","titleAvailable","actionCost","action","setActionState","useState","held","setHeld","widths","setWidths","hasAction","setAction","useCallback","next","current","trailingWith","record","width","measure","useMemo","trailing"],"sources":["../../../src/shell/shellTopBarSlot.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@multiplatform.one/backoffice",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.65.0",
|
|
4
4
|
"description": "Embeddable Frappe desk recreation (backoffice) for the multiplatform.one stack",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"backoffice",
|
|
@@ -71,21 +71,21 @@
|
|
|
71
71
|
"access": "public"
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@multiplatform.one/components": "^7.
|
|
75
|
-
"@multiplatform.one/forms": "^7.
|
|
76
|
-
"@multiplatform.one/frappe": "^7.
|
|
77
|
-
"@multiplatform.one/frappe-ui": "^7.
|
|
78
|
-
"@multiplatform.one/i18n": "^7.
|
|
79
|
-
"@multiplatform.one/platform": "^7.
|
|
80
|
-
"@multiplatform.one/store": "^7.
|
|
81
|
-
"@multiplatform.one/table": "^7.
|
|
82
|
-
"@multiplatform.one/theme": "^7.
|
|
74
|
+
"@multiplatform.one/components": "^7.65.0",
|
|
75
|
+
"@multiplatform.one/forms": "^7.65.0",
|
|
76
|
+
"@multiplatform.one/frappe": "^7.65.0",
|
|
77
|
+
"@multiplatform.one/frappe-ui": "^7.65.0",
|
|
78
|
+
"@multiplatform.one/i18n": "^7.65.0",
|
|
79
|
+
"@multiplatform.one/platform": "^7.65.0",
|
|
80
|
+
"@multiplatform.one/store": "^7.65.0",
|
|
81
|
+
"@multiplatform.one/table": "^7.65.0",
|
|
82
|
+
"@multiplatform.one/theme": "^7.65.0",
|
|
83
83
|
"@phosphor-icons/react": "^2.1.10",
|
|
84
84
|
"tamagui": "2.7.6"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
|
-
"@multiplatform.one/config": "7.
|
|
88
|
-
"@multiplatform.one/test-utils": "7.
|
|
87
|
+
"@multiplatform.one/config": "7.65.0",
|
|
88
|
+
"@multiplatform.one/test-utils": "7.65.0",
|
|
89
89
|
"@tamagui/build": "2.7.6",
|
|
90
90
|
"@testing-library/react": "^16.3.3",
|
|
91
91
|
"@types/react-dom": "^19.2.3",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
// a full-height sheet <sm, both fed by one section model
|
|
11
11
|
// (chrome/command-palette-model.ts).
|
|
12
12
|
import { MagnifyingGlassIcon } from "@phosphor-icons/react";
|
|
13
|
-
import {
|
|
13
|
+
import { Kbd, Text, isWeb, themed } from "@multiplatform.one/components";
|
|
14
14
|
import { Button } from "@multiplatform.one/forms";
|
|
15
15
|
import { useLayoutSizeClass, useResolvedKnobs } from "@multiplatform.one/theme";
|
|
16
16
|
import type { Ref } from "react";
|
|
@@ -32,17 +32,6 @@ export interface BackofficeAwesomebarProps {
|
|
|
32
32
|
focusRef?: Ref<BackofficeAwesomebarHandle>;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
/** Platform modifier label; SSR/native-safe (defaults to "Ctrl"). */
|
|
36
|
-
function getModLabel(): string {
|
|
37
|
-
if (
|
|
38
|
-
typeof navigator !== "undefined" &&
|
|
39
|
-
/Mac|iPhone|iPad|iPod/i.test(String(navigator.platform ?? ""))
|
|
40
|
-
) {
|
|
41
|
-
return "\u2318";
|
|
42
|
-
}
|
|
43
|
-
return "Ctrl";
|
|
44
|
-
}
|
|
45
|
-
|
|
46
35
|
export function BackofficeAwesomebar({ focusRef }: BackofficeAwesomebarProps = {}) {
|
|
47
36
|
const { t } = useTranslation(BACKOFFICE_I18N_NAMESPACE);
|
|
48
37
|
const isCompact = useLayoutSizeClass() === "compact";
|
|
@@ -77,20 +66,7 @@ export function BackofficeAwesomebar({ focusRef }: BackofficeAwesomebarProps = {
|
|
|
77
66
|
{label}
|
|
78
67
|
</Text>
|
|
79
68
|
)}
|
|
80
|
-
{showShortcutHint &&
|
|
81
|
-
<XStack
|
|
82
|
-
{...knobProps.surface}
|
|
83
|
-
backgroundColor="$color2"
|
|
84
|
-
borderRadius="$2"
|
|
85
|
-
paddingHorizontal="$1.5"
|
|
86
|
-
flexShrink={0}
|
|
87
|
-
aria-hidden
|
|
88
|
-
>
|
|
89
|
-
<SizableText size="$1" fontWeight="600" color="$color11">
|
|
90
|
-
{`${getModLabel()} K`}
|
|
91
|
-
</SizableText>
|
|
92
|
-
</XStack>
|
|
93
|
-
)}
|
|
69
|
+
{showShortcutHint && <Kbd keys="Mod+K" aria-hidden />}
|
|
94
70
|
</Button>
|
|
95
71
|
<CommandPalette open={open} onOpenChange={setOpen} />
|
|
96
72
|
</>
|
|
@@ -14,16 +14,10 @@ import { InMemoryFixtureProvider } from "@multiplatform.one/frappe";
|
|
|
14
14
|
import { storage } from "@multiplatform.one/store";
|
|
15
15
|
import { Text, YStack } from "@multiplatform.one/components";
|
|
16
16
|
import { useState, type ReactNode } from "react";
|
|
17
|
-
import { sizeRecipeEscape } from "@multiplatform.one/theme";
|
|
18
17
|
import { BackofficeProvider } from "../config/BackofficeProvider";
|
|
19
18
|
import { createMemoryNavigator } from "../navigation/navigator";
|
|
20
19
|
import { CommandPalette } from "./CommandPalette";
|
|
21
20
|
|
|
22
|
-
const frameHeight = sizeRecipeEscape(
|
|
23
|
-
620,
|
|
24
|
-
"story canvas: a fixed-height frame for a full-height screen to fill",
|
|
25
|
-
);
|
|
26
|
-
|
|
27
21
|
const meta = {
|
|
28
22
|
title: "Screens/Backoffice/CommandPalette",
|
|
29
23
|
component: CommandPalette,
|
|
@@ -155,7 +149,7 @@ function Host({ children }: { children: ReactNode }) {
|
|
|
155
149
|
frappe={{ baseURL: MOCK_HOST, fixtures: makeFixtures() }}
|
|
156
150
|
navigation={createMemoryNavigator("/backoffice")}
|
|
157
151
|
>
|
|
158
|
-
<YStack flex={1} height=
|
|
152
|
+
<YStack flex={1} height="100vh" padding="$4" gap="$3" backgroundColor="$color2">
|
|
159
153
|
{children}
|
|
160
154
|
</YStack>
|
|
161
155
|
</BackofficeProvider>
|
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
componentColors,
|
|
19
19
|
Dialog,
|
|
20
20
|
DialogContent,
|
|
21
|
+
Kbd,
|
|
21
22
|
ScrollView,
|
|
22
23
|
SheetModal,
|
|
23
24
|
SizableText,
|
|
@@ -609,23 +610,6 @@ function PaletteResults({
|
|
|
609
610
|
// Footer hint bar (overlay container only — keyboard hints, DG discoverable)
|
|
610
611
|
// ---------------------------------------------------------------------------
|
|
611
612
|
|
|
612
|
-
function KeyCap({ label }: { label: string }) {
|
|
613
|
-
return (
|
|
614
|
-
<XStack
|
|
615
|
-
borderWidth={1}
|
|
616
|
-
borderColor="$borderColor"
|
|
617
|
-
backgroundColor="$color2"
|
|
618
|
-
borderRadius="$2"
|
|
619
|
-
paddingHorizontal="$1.5"
|
|
620
|
-
justifyContent="center"
|
|
621
|
-
>
|
|
622
|
-
<SizableText size="$1" color="$color11">
|
|
623
|
-
{label}
|
|
624
|
-
</SizableText>
|
|
625
|
-
</XStack>
|
|
626
|
-
);
|
|
627
|
-
}
|
|
628
|
-
|
|
629
613
|
function PaletteFooter() {
|
|
630
614
|
const { t } = useTranslation(BACKOFFICE_I18N_NAMESPACE);
|
|
631
615
|
return (
|
|
@@ -638,19 +622,19 @@ function PaletteFooter() {
|
|
|
638
622
|
borderTopColor="$borderColor"
|
|
639
623
|
>
|
|
640
624
|
<XStack alignItems="center" gap="$1.5">
|
|
641
|
-
<
|
|
625
|
+
<Kbd keys="↑↓" />
|
|
642
626
|
<SizableText size="$1" color="$color10">
|
|
643
627
|
{t("awesomebar.hintNavigate", "navigate")}
|
|
644
628
|
</SizableText>
|
|
645
629
|
</XStack>
|
|
646
630
|
<XStack alignItems="center" gap="$1.5">
|
|
647
|
-
<
|
|
631
|
+
<Kbd keys="Enter" />
|
|
648
632
|
<SizableText size="$1" color="$color10">
|
|
649
633
|
{t("awesomebar.hintOpen", "open")}
|
|
650
634
|
</SizableText>
|
|
651
635
|
</XStack>
|
|
652
636
|
<XStack alignItems="center" gap="$1.5">
|
|
653
|
-
<
|
|
637
|
+
<Kbd keys="esc" />
|
|
654
638
|
<SizableText size="$1" color="$color10">
|
|
655
639
|
{t("awesomebar.hintClose", "close")}
|
|
656
640
|
</SizableText>
|
|
@@ -9,12 +9,13 @@ import {
|
|
|
9
9
|
Button,
|
|
10
10
|
Dialog,
|
|
11
11
|
DialogContent,
|
|
12
|
+
Kbd,
|
|
12
13
|
Paragraph,
|
|
13
14
|
SizableText,
|
|
14
15
|
XStack,
|
|
15
16
|
YStack,
|
|
16
17
|
} from "@multiplatform.one/components";
|
|
17
|
-
import { sizeRecipeEscape
|
|
18
|
+
import { sizeRecipeEscape } from "@multiplatform.one/theme";
|
|
18
19
|
import { useTranslation } from "react-i18next";
|
|
19
20
|
import { BACKOFFICE_I18N_NAMESPACE } from "../i18n";
|
|
20
21
|
|
|
@@ -23,39 +24,9 @@ export interface HelpShortcutsDialogProps {
|
|
|
23
24
|
onOpenChange: (open: boolean) => void;
|
|
24
25
|
}
|
|
25
26
|
|
|
26
|
-
/** Platform modifier label; SSR/native-safe (defaults to "Ctrl"). */
|
|
27
|
-
function getModLabel(): string {
|
|
28
|
-
if (
|
|
29
|
-
typeof navigator !== "undefined" &&
|
|
30
|
-
/Mac|iPhone|iPad|iPod/i.test(String(navigator.platform ?? ""))
|
|
31
|
-
) {
|
|
32
|
-
return "\u2318";
|
|
33
|
-
}
|
|
34
|
-
return "Ctrl";
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
function KeyChip({ label }: { label: string }) {
|
|
38
|
-
const { knobProps } = useResolvedKnobs();
|
|
39
|
-
return (
|
|
40
|
-
<XStack
|
|
41
|
-
{...knobProps.borderRadius}
|
|
42
|
-
borderColor="$borderColor"
|
|
43
|
-
backgroundColor="$color2"
|
|
44
|
-
paddingHorizontal="$2"
|
|
45
|
-
paddingVertical="$1"
|
|
46
|
-
minWidth="$2"
|
|
47
|
-
justifyContent="center"
|
|
48
|
-
>
|
|
49
|
-
<SizableText size="$1" fontWeight="400">
|
|
50
|
-
{label}
|
|
51
|
-
</SizableText>
|
|
52
|
-
</XStack>
|
|
53
|
-
);
|
|
54
|
-
}
|
|
55
|
-
|
|
56
27
|
interface ShortcutRowProps {
|
|
57
|
-
/** Alternative key combos, e.g. [
|
|
58
|
-
combos: string[]
|
|
28
|
+
/** Alternative key combos, e.g. ["Mod+K", "Mod+G"]; Kbd draws Mod per platform. */
|
|
29
|
+
combos: string[];
|
|
59
30
|
description: string;
|
|
60
31
|
}
|
|
61
32
|
|
|
@@ -73,22 +44,13 @@ function ShortcutRow({ combos, description }: ShortcutRowProps) {
|
|
|
73
44
|
flexShrink={0}
|
|
74
45
|
>
|
|
75
46
|
{combos.map((combo, comboIndex) => (
|
|
76
|
-
<XStack key={combo
|
|
47
|
+
<XStack key={combo} gap="$1" alignItems="center">
|
|
77
48
|
{comboIndex > 0 && (
|
|
78
49
|
<SizableText size="$2" color="$color10">
|
|
79
50
|
/
|
|
80
51
|
</SizableText>
|
|
81
52
|
)}
|
|
82
|
-
{combo
|
|
83
|
-
<XStack key={key} gap="$1" alignItems="center">
|
|
84
|
-
{keyIndex > 0 && (
|
|
85
|
-
<SizableText size="$2" color="$color10">
|
|
86
|
-
+
|
|
87
|
-
</SizableText>
|
|
88
|
-
)}
|
|
89
|
-
<KeyChip label={key} />
|
|
90
|
-
</XStack>
|
|
91
|
-
))}
|
|
53
|
+
<Kbd keys={combo} />
|
|
92
54
|
</XStack>
|
|
93
55
|
))}
|
|
94
56
|
</XStack>
|
|
@@ -101,22 +63,18 @@ function ShortcutRow({ combos, description }: ShortcutRowProps) {
|
|
|
101
63
|
|
|
102
64
|
export function HelpShortcutsDialog({ open, onOpenChange }: HelpShortcutsDialogProps) {
|
|
103
65
|
const { t } = useTranslation(BACKOFFICE_I18N_NAMESPACE);
|
|
104
|
-
const mod = getModLabel();
|
|
105
66
|
|
|
106
67
|
const rows: ShortcutRowProps[] = [
|
|
107
68
|
{
|
|
108
|
-
combos: [
|
|
109
|
-
[mod, "K"],
|
|
110
|
-
[mod, "G"],
|
|
111
|
-
],
|
|
69
|
+
combos: ["Mod+K", "Mod+G"],
|
|
112
70
|
description: t("help.shortcutFocusSearch", "Open the command palette"),
|
|
113
71
|
},
|
|
114
72
|
{
|
|
115
|
-
combos: [
|
|
73
|
+
combos: ["Mod+S"],
|
|
116
74
|
description: t("help.shortcutSaveForm", "Save the open document"),
|
|
117
75
|
},
|
|
118
76
|
{
|
|
119
|
-
combos: [
|
|
77
|
+
combos: ["Esc"],
|
|
120
78
|
description: t("help.shortcutCloseOverlays", "Close dialogs and menus"),
|
|
121
79
|
},
|
|
122
80
|
];
|
|
@@ -13,15 +13,9 @@
|
|
|
13
13
|
import { Text, YStack } from "@multiplatform.one/components";
|
|
14
14
|
import { InMemoryFixtureProvider } from "@multiplatform.one/frappe";
|
|
15
15
|
import type { ReactNode } from "react";
|
|
16
|
-
import { sizeRecipeEscape } from "@multiplatform.one/theme";
|
|
17
16
|
import { Desk } from "./Desk";
|
|
18
17
|
import type { DeskSurfaceProps } from "./DeskSurface";
|
|
19
18
|
|
|
20
|
-
const frameHeight = sizeRecipeEscape(
|
|
21
|
-
680,
|
|
22
|
-
"story canvas: a fixed-height frame for a full-height screen to fill",
|
|
23
|
-
);
|
|
24
|
-
|
|
25
19
|
const meta = {
|
|
26
20
|
title: "Screens/Backoffice/Desk",
|
|
27
21
|
component: Desk,
|
|
@@ -182,7 +176,7 @@ const frappe = () => ({ baseURL: MOCK_HOST, fixtures: makeFixtures() });
|
|
|
182
176
|
|
|
183
177
|
function Frame({ children }: { children: ReactNode }) {
|
|
184
178
|
return (
|
|
185
|
-
<YStack height=
|
|
179
|
+
<YStack height="100vh" minHeight={0}>
|
|
186
180
|
{children}
|
|
187
181
|
</YStack>
|
|
188
182
|
);
|
|
@@ -12,17 +12,11 @@
|
|
|
12
12
|
import { Text, YStack } from "@multiplatform.one/components";
|
|
13
13
|
import { InMemoryFixtureProvider } from "@multiplatform.one/frappe";
|
|
14
14
|
import type { ReactNode } from "react";
|
|
15
|
-
import { sizeRecipeEscape } from "@multiplatform.one/theme";
|
|
16
15
|
import { BackofficeProvider } from "../config/BackofficeProvider";
|
|
17
16
|
import { createMemoryNavigator } from "../navigation/navigator";
|
|
18
17
|
import { DeskSurface, DeskSurfaceLoading, type DeskSurfaceProps } from "./DeskSurface";
|
|
19
18
|
import type { DeskTarget } from "./target";
|
|
20
19
|
|
|
21
|
-
const frameHeight = sizeRecipeEscape(
|
|
22
|
-
560,
|
|
23
|
-
"story canvas: a fixed-height frame for a full-height screen to fill",
|
|
24
|
-
);
|
|
25
|
-
|
|
26
20
|
const meta = {
|
|
27
21
|
title: "Screens/Backoffice/DeskSurface",
|
|
28
22
|
component: DeskSurface,
|
|
@@ -199,7 +193,7 @@ function Surface({ target, children }: { target?: DeskTarget; children?: ReactNo
|
|
|
199
193
|
frappe={{ baseURL: MOCK_HOST, fixtures: makeFixtures() }}
|
|
200
194
|
navigation={createMemoryNavigator("/backoffice")}
|
|
201
195
|
>
|
|
202
|
-
<YStack flex={1} height=
|
|
196
|
+
<YStack flex={1} height="100vh" minHeight={0}>
|
|
203
197
|
{children ?? (target ? <DeskSurface target={target} /> : null)}
|
|
204
198
|
</YStack>
|
|
205
199
|
</BackofficeProvider>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Proves the real Pokemon layout, empty and multi-tab forms, selected properties and compact sheets.
|
|
2
2
|
import { ToastViewport, YStack } from "@multiplatform.one/components";
|
|
3
3
|
import { InMemoryFixtureProvider, type FrappeDocData } from "@multiplatform.one/frappe";
|
|
4
|
-
import { Preset
|
|
4
|
+
import { Preset } from "@multiplatform.one/theme";
|
|
5
5
|
import { useState, useSyncExternalStore } from "react";
|
|
6
6
|
import pokemon from "../../../../apps/frappe/apps/core/core/app/doctype/pokemon/pokemon.json";
|
|
7
7
|
import { BackofficeProvider } from "../config/BackofficeProvider";
|
|
@@ -25,10 +25,6 @@ const meta = {
|
|
|
25
25
|
};
|
|
26
26
|
export default meta;
|
|
27
27
|
|
|
28
|
-
const frameHeight = sizeRecipeEscape(
|
|
29
|
-
780,
|
|
30
|
-
"story canvas: a fixed-height frame for a full-height form builder",
|
|
31
|
-
);
|
|
32
28
|
const emptyMeta = { doctype: "DocType", name: "Empty Form", custom: 1, fields: [] };
|
|
33
29
|
const fieldKinds = [
|
|
34
30
|
{ fieldtype: "Data", label: "Title" },
|
|
@@ -90,7 +86,7 @@ function BuilderStory({ doctype, initialSelection }: FormBuilderScreenProps) {
|
|
|
90
86
|
navigation={navigation}
|
|
91
87
|
>
|
|
92
88
|
<YStack
|
|
93
|
-
height=
|
|
89
|
+
height="100vh"
|
|
94
90
|
maxHeight="100dvh"
|
|
95
91
|
minHeight={0}
|
|
96
92
|
minWidth={0}
|
|
@@ -137,6 +137,19 @@ describe("DoctypeListScreen compact head (FZ-7974)", () => {
|
|
|
137
137
|
expect(screen.getAllByLabelText(newLabel)).toHaveLength(1);
|
|
138
138
|
});
|
|
139
139
|
|
|
140
|
+
it("draws New as a plain accent glyph, not a filled disc (LC-172)", async () => {
|
|
141
|
+
renderList();
|
|
142
|
+
await waitFor(() => expect(screen.getByLabelText(newLabel)).toBeTruthy(), settle);
|
|
143
|
+
const button = screen.getByLabelText(newLabel);
|
|
144
|
+
expect(button.getAttribute("data-top-bar-control")).toBe("action");
|
|
145
|
+
const restFill = Array.from(button.classList).filter(
|
|
146
|
+
(c) => c.startsWith("_bg-") && !/^_bg-0(hover|active|focus|press)/.test(c),
|
|
147
|
+
);
|
|
148
|
+
expect(restFill).toEqual(["_bg-transparent"]);
|
|
149
|
+
expect(button.getAttribute("data-radius-part")).toBeNull();
|
|
150
|
+
expect(button.getAttribute("data-mp-action-role")).toBeNull();
|
|
151
|
+
});
|
|
152
|
+
|
|
140
153
|
it("ends the row with New when no shell can take it", async () => {
|
|
141
154
|
renderList({ shell: false });
|
|
142
155
|
await waitFor(() => expect(screen.getByLabelText(newLabel)).toBeTruthy(), settle);
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
EmptyState,
|
|
14
14
|
type DropdownMenuEntry,
|
|
15
15
|
H1,
|
|
16
|
+
PageActionButton,
|
|
16
17
|
PageHeader,
|
|
17
18
|
Paragraph,
|
|
18
19
|
ScrollView,
|
|
@@ -913,13 +914,11 @@ export function DoctypeListScreen({
|
|
|
913
914
|
onViewChange: handleViewChange,
|
|
914
915
|
});
|
|
915
916
|
|
|
916
|
-
// LC-128 (FZ-7974): on a phone New is the top bar's trailing action
|
|
917
|
-
// shell above takes it into its banner
|
|
918
|
-
// control row.
|
|
917
|
+
// LC-128 (FZ-7974): on a phone New is the top bar's trailing action, a
|
|
918
|
+
// plain accent glyph. A shell above takes it into its banner while the
|
|
919
|
+
// title fits beside it; otherwise it ends the page's control row.
|
|
919
920
|
const compactNewButton = (
|
|
920
|
-
<
|
|
921
|
-
accent
|
|
922
|
-
circular
|
|
921
|
+
<PageActionButton
|
|
923
922
|
icon={PlusIcon}
|
|
924
923
|
onPress={() => setQuickEntryOpen(true)}
|
|
925
924
|
aria-label={t("list.new", {
|
|
@@ -1161,6 +1160,9 @@ export function DoctypeListScreen({
|
|
|
1161
1160
|
// LC-146: on a phone the list scrolls edge to edge, so the header and
|
|
1162
1161
|
// the list body each take the gutter instead of the screen.
|
|
1163
1162
|
{...(compactChrome ? { paddingHorizontal: 0 } : {})}
|
|
1163
|
+
// LC-173: the list region reaches the bottom edge; the gutter under the
|
|
1164
|
+
// last row scrolls with it instead of standing as a band below.
|
|
1165
|
+
paddingBottom={0}
|
|
1164
1166
|
>
|
|
1165
1167
|
{compactChrome ? (
|
|
1166
1168
|
<YStack paddingHorizontal={knobProps.panelPadding.padding}>{compactHeader}</YStack>
|
|
@@ -1298,13 +1300,21 @@ export function DoctypeListScreen({
|
|
|
1298
1300
|
const gutter = knobProps.panelPadding.padding as string;
|
|
1299
1301
|
return compactChrome ? (
|
|
1300
1302
|
<ScrollView flex={1} minHeight={0} testID="backoffice-list-scroll">
|
|
1301
|
-
<YStack
|
|
1303
|
+
<YStack
|
|
1304
|
+
paddingHorizontal={gutter as "$4"}
|
|
1305
|
+
paddingBottom={gutter as "$4"}
|
|
1306
|
+
flexGrow={1}
|
|
1307
|
+
flexShrink={0}
|
|
1308
|
+
flexBasis="auto"
|
|
1309
|
+
>
|
|
1302
1310
|
<PageGutter inset={gutter}>{listBody}</PageGutter>
|
|
1303
1311
|
</YStack>
|
|
1304
1312
|
</ScrollView>
|
|
1305
1313
|
) : (
|
|
1306
1314
|
<ScrollView flex={1} minHeight={0} testID="backoffice-list-scroll">
|
|
1307
|
-
{
|
|
1315
|
+
<YStack paddingBottom={gutter as "$4"} flexGrow={1} flexShrink={0} flexBasis="auto">
|
|
1316
|
+
{listBody}
|
|
1317
|
+
</YStack>
|
|
1308
1318
|
</ScrollView>
|
|
1309
1319
|
);
|
|
1310
1320
|
})()}
|
|
@@ -233,9 +233,48 @@ export function BackofficeShell({ children, activePath, onNavigate, title }: Bac
|
|
|
233
233
|
aria-label={t("shell.home", "Home")}
|
|
234
234
|
data-testid="backoffice-home"
|
|
235
235
|
>
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
236
|
+
{isNarrow ? (
|
|
237
|
+
// The title outranks the page action (LC-128): the slot measures
|
|
238
|
+
// the room the title gets and its width on one line, and holds the
|
|
239
|
+
// action in the banner only while the title fits whole.
|
|
240
|
+
<YStack
|
|
241
|
+
flex={1}
|
|
242
|
+
minWidth={0}
|
|
243
|
+
position="relative"
|
|
244
|
+
overflow="hidden"
|
|
245
|
+
onLayout={(event) => topBarSlot.measure.titleAvailable(event.nativeEvent.layout.width)}
|
|
246
|
+
>
|
|
247
|
+
<SizableText {...knobProps.heading} numberOfLines={1}>
|
|
248
|
+
{bannerTitle}
|
|
249
|
+
</SizableText>
|
|
250
|
+
{topBarSlot.action != null ? (
|
|
251
|
+
<XStack
|
|
252
|
+
position="absolute"
|
|
253
|
+
top={0}
|
|
254
|
+
left={0}
|
|
255
|
+
width="1000%"
|
|
256
|
+
opacity={0}
|
|
257
|
+
pointerEvents="none"
|
|
258
|
+
aria-hidden
|
|
259
|
+
>
|
|
260
|
+
<XStack
|
|
261
|
+
flexShrink={0}
|
|
262
|
+
onLayout={(event) =>
|
|
263
|
+
topBarSlot.measure.titleNatural(event.nativeEvent.layout.width)
|
|
264
|
+
}
|
|
265
|
+
>
|
|
266
|
+
<SizableText {...knobProps.heading} whiteSpace="nowrap" flexShrink={0}>
|
|
267
|
+
{bannerTitle}
|
|
268
|
+
</SizableText>
|
|
269
|
+
</XStack>
|
|
270
|
+
</XStack>
|
|
271
|
+
) : null}
|
|
272
|
+
</YStack>
|
|
273
|
+
) : (
|
|
274
|
+
<SizableText {...knobProps.heading} numberOfLines={1}>
|
|
275
|
+
{bannerTitle}
|
|
276
|
+
</SizableText>
|
|
277
|
+
)}
|
|
239
278
|
</Button>
|
|
240
279
|
|
|
241
280
|
{/* Centered awesomebar (the flex spacer keeps the right chrome pinned
|
|
@@ -259,8 +298,13 @@ export function BackofficeShell({ children, activePath, onNavigate, title }: Bac
|
|
|
259
298
|
|
|
260
299
|
{/* Right chrome: the page's own action (LC-128, FZ-7974) leads the
|
|
261
300
|
shell's global controls. */}
|
|
262
|
-
<XStack
|
|
263
|
-
|
|
301
|
+
<XStack
|
|
302
|
+
alignItems="center"
|
|
303
|
+
gap="$1"
|
|
304
|
+
flexShrink={0}
|
|
305
|
+
onLayout={(event) => topBarSlot.measure.trailing(event.nativeEvent.layout.width)}
|
|
306
|
+
>
|
|
307
|
+
{topBarSlot.held ? (
|
|
264
308
|
<XStack alignItems="center" data-testid="backoffice-shell-page-action">
|
|
265
309
|
{topBarSlot.action}
|
|
266
310
|
</XStack>
|