@multiplatform.one/backoffice 7.46.0 → 7.47.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 +1 -2
- package/dist/cjs/chrome/BackofficeAwesomebar.native.js +1 -2
- package/dist/cjs/chrome/BackofficeAwesomebar.native.js.map +1 -1
- package/dist/cjs/chrome/CommandPalette.cjs +1 -1
- package/dist/cjs/chrome/CommandPalette.native.js +1 -1
- package/dist/cjs/chrome/CommandPalette.native.js.map +1 -1
- package/dist/cjs/form/DocFormScreen.cjs +1 -0
- package/dist/cjs/form/DocFormScreen.native.js +1 -0
- package/dist/cjs/form/FormToolbar.cjs +59 -39
- package/dist/cjs/form/FormToolbar.native.js +65 -39
- package/dist/cjs/form/FormToolbar.native.js.map +1 -1
- package/dist/cjs/formBuilder/useFormBuilderDrag.cjs +8 -1
- package/dist/cjs/formBuilder/useFormBuilderDrag.native.js +8 -1
- package/dist/cjs/formBuilder/useFormBuilderDrag.native.js.map +1 -1
- package/dist/cjs/i18n/en.cjs +3 -3
- package/dist/cjs/i18n/en.native.js +3 -3
- package/dist/cjs/i18n/en.native.js.map +1 -1
- package/dist/cjs/list/DoctypeListScreen.cjs +24 -6
- package/dist/cjs/list/DoctypeListScreen.native.js +28 -8
- package/dist/cjs/list/DoctypeListScreen.native.js.map +1 -1
- package/dist/cjs/list/list-paging.cjs +38 -43
- package/dist/cjs/list/list-paging.native.js +40 -47
- package/dist/cjs/list/list-paging.native.js.map +1 -1
- package/dist/esm/chrome/BackofficeAwesomebar.mjs +1 -2
- package/dist/esm/chrome/BackofficeAwesomebar.mjs.map +1 -1
- package/dist/esm/chrome/BackofficeAwesomebar.native.js +1 -2
- package/dist/esm/chrome/BackofficeAwesomebar.native.js.map +1 -1
- package/dist/esm/chrome/CommandPalette.mjs +1 -1
- package/dist/esm/chrome/CommandPalette.mjs.map +1 -1
- package/dist/esm/chrome/CommandPalette.native.js +1 -1
- package/dist/esm/chrome/CommandPalette.native.js.map +1 -1
- package/dist/esm/form/DocFormScreen.mjs +1 -0
- package/dist/esm/form/DocFormScreen.mjs.map +1 -1
- package/dist/esm/form/DocFormScreen.native.js +1 -0
- package/dist/esm/form/FormToolbar.mjs +61 -41
- package/dist/esm/form/FormToolbar.mjs.map +1 -1
- package/dist/esm/form/FormToolbar.native.js +67 -41
- package/dist/esm/form/FormToolbar.native.js.map +1 -1
- package/dist/esm/formBuilder/useFormBuilderDrag.mjs +8 -1
- package/dist/esm/formBuilder/useFormBuilderDrag.mjs.map +1 -1
- package/dist/esm/formBuilder/useFormBuilderDrag.native.js +8 -1
- package/dist/esm/formBuilder/useFormBuilderDrag.native.js.map +1 -1
- package/dist/esm/i18n/en.mjs +3 -3
- package/dist/esm/i18n/en.mjs.map +1 -1
- package/dist/esm/i18n/en.native.js +3 -3
- package/dist/esm/i18n/en.native.js.map +1 -1
- package/dist/esm/list/DoctypeListScreen.mjs +26 -8
- package/dist/esm/list/DoctypeListScreen.mjs.map +1 -1
- package/dist/esm/list/DoctypeListScreen.native.js +30 -10
- package/dist/esm/list/DoctypeListScreen.native.js.map +1 -1
- package/dist/esm/list/list-paging.mjs +38 -44
- package/dist/esm/list/list-paging.mjs.map +1 -1
- package/dist/esm/list/list-paging.native.js +40 -48
- package/dist/esm/list/list-paging.native.js.map +1 -1
- package/dist/jsx/chrome/BackofficeAwesomebar.mjs +1 -2
- package/dist/jsx/chrome/BackofficeAwesomebar.mjs.map +1 -1
- package/dist/jsx/chrome/BackofficeAwesomebar.native.js +1 -2
- package/dist/jsx/chrome/BackofficeAwesomebar.native.js.map +1 -1
- package/dist/jsx/chrome/CommandPalette.mjs +1 -1
- package/dist/jsx/chrome/CommandPalette.mjs.map +1 -1
- package/dist/jsx/chrome/CommandPalette.native.js +1 -1
- package/dist/jsx/chrome/CommandPalette.native.js.map +1 -1
- package/dist/jsx/form/DocFormScreen.mjs +1 -0
- package/dist/jsx/form/DocFormScreen.mjs.map +1 -1
- package/dist/jsx/form/DocFormScreen.native.js +1 -0
- package/dist/jsx/form/DocFormScreen.native.js.map +1 -1
- package/dist/jsx/form/FormToolbar.mjs +61 -41
- package/dist/jsx/form/FormToolbar.mjs.map +1 -1
- package/dist/jsx/form/FormToolbar.native.js +65 -39
- package/dist/jsx/form/FormToolbar.native.js.map +1 -1
- package/dist/jsx/formBuilder/useFormBuilderDrag.mjs +8 -1
- package/dist/jsx/formBuilder/useFormBuilderDrag.mjs.map +1 -1
- package/dist/jsx/formBuilder/useFormBuilderDrag.native.js +8 -1
- package/dist/jsx/formBuilder/useFormBuilderDrag.native.js.map +1 -1
- package/dist/jsx/i18n/en.mjs +3 -3
- package/dist/jsx/i18n/en.mjs.map +1 -1
- package/dist/jsx/i18n/en.native.js +3 -3
- package/dist/jsx/i18n/en.native.js.map +1 -1
- package/dist/jsx/list/DoctypeListScreen.mjs +26 -8
- package/dist/jsx/list/DoctypeListScreen.mjs.map +1 -1
- package/dist/jsx/list/DoctypeListScreen.native.js +28 -8
- package/dist/jsx/list/DoctypeListScreen.native.js.map +1 -1
- package/dist/jsx/list/list-paging.mjs +38 -44
- package/dist/jsx/list/list-paging.mjs.map +1 -1
- package/dist/jsx/list/list-paging.native.js +40 -47
- package/dist/jsx/list/list-paging.native.js.map +1 -1
- package/package.json +12 -12
- package/src/chrome/BackofficeAwesomebar.tsx +1 -2
- package/src/chrome/CommandPalette.tsx +3 -1
- package/src/chrome/UserMenu.screen.spec.tsx +2 -2
- package/src/form/DocFormScreen.tsx +1 -1
- package/src/form/FormToolbar.screen.spec.tsx +29 -0
- package/src/form/FormToolbar.tsx +74 -33
- package/src/formBuilder/useFormBuilderDrag.ts +6 -1
- package/src/i18n/en.ts +3 -3
- package/src/list/DoctypeListScreen.tsx +26 -17
- package/src/list/list-paging.screen.spec.tsx +57 -27
- package/src/list/list-paging.tsx +48 -53
- package/types/chrome/BackofficeAwesomebar.d.ts.map +1 -1
- package/types/form/FormToolbar.d.ts.map +1 -1
- package/types/formBuilder/useFormBuilderDrag.d.ts.map +1 -1
- package/types/i18n/en.d.ts +3 -3
- package/types/list/DoctypeListScreen.d.ts.map +1 -1
- package/types/list/list-paging.d.ts +5 -5
- package/types/list/list-paging.d.ts.map +1 -1
|
@@ -24,22 +24,22 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
24
24
|
}), mod);
|
|
25
25
|
var list_paging_exports = {};
|
|
26
26
|
__export(list_paging_exports, {
|
|
27
|
-
|
|
27
|
+
LIST_DOT_PAGES: () => LIST_DOT_PAGES,
|
|
28
|
+
LIST_PAGE_SIZE: () => LIST_PAGE_SIZE,
|
|
28
29
|
ListPaging: () => ListPaging
|
|
29
30
|
});
|
|
30
31
|
module.exports = __toCommonJS(list_paging_exports);
|
|
31
32
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
32
33
|
var import_components = require("@multiplatform.one/components");
|
|
33
|
-
var
|
|
34
|
+
var import_theme = require("@multiplatform.one/theme");
|
|
34
35
|
var import_react_i18next = require("react-i18next");
|
|
35
36
|
var import_i18n = require("../i18n/index.native.js");
|
|
36
|
-
var
|
|
37
|
+
var LIST_PAGE_SIZE = 20;
|
|
38
|
+
var LIST_DOT_PAGES = 10;
|
|
37
39
|
function ListPaging(param) {
|
|
38
40
|
var {
|
|
39
41
|
pagination,
|
|
40
42
|
onPaginationChange,
|
|
41
|
-
step,
|
|
42
|
-
onStepChange,
|
|
43
43
|
shown,
|
|
44
44
|
total
|
|
45
45
|
} = param;
|
|
@@ -47,57 +47,50 @@ function ListPaging(param) {
|
|
|
47
47
|
var {
|
|
48
48
|
t
|
|
49
49
|
} = (0, import_react_i18next.useTranslation)(import_i18n.BACKOFFICE_I18N_NAMESPACE);
|
|
50
|
+
var compact = (0, import_theme.useLayoutSizeClass)() === "compact";
|
|
51
|
+
var {
|
|
52
|
+
pageIndex,
|
|
53
|
+
pageSize
|
|
54
|
+
} = pagination;
|
|
50
55
|
var known = Math.max((_pagination_totalCount = pagination.totalCount) !== null && _pagination_totalCount !== void 0 ? _pagination_totalCount : 0, total !== null && total !== void 0 ? total : 0) || void 0;
|
|
51
|
-
var
|
|
52
|
-
|
|
56
|
+
var pages = known !== void 0 ? Math.max(1, Math.ceil(known / pageSize)) : pageIndex + (shown >= pageSize ? 2 : 1);
|
|
57
|
+
if (pages <= 1) return null;
|
|
58
|
+
var goTo = function goTo2(page) {
|
|
59
|
+
return onPaginationChange({
|
|
60
|
+
pageIndex: page - 1,
|
|
61
|
+
pageSize
|
|
62
|
+
});
|
|
63
|
+
};
|
|
64
|
+
var start = pageIndex * pageSize + 1;
|
|
65
|
+
var end = pageIndex * pageSize + (shown > 0 ? shown : pageSize);
|
|
66
|
+
var dots = compact && known !== void 0 && pages <= LIST_DOT_PAGES;
|
|
67
|
+
var variant = dots ? "dots" : compact || known === void 0 ? "simple" : "numbered";
|
|
53
68
|
return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.YStack, {
|
|
54
|
-
|
|
69
|
+
alignItems: "center",
|
|
55
70
|
flexGrow: 1,
|
|
56
71
|
testID: "backoffice-list-paging",
|
|
57
|
-
children: [
|
|
72
|
+
children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Pagination, {
|
|
73
|
+
variant,
|
|
74
|
+
total: pages,
|
|
75
|
+
page: pageIndex + 1,
|
|
76
|
+
onPageChange: goTo,
|
|
77
|
+
allowJumpTo: true,
|
|
78
|
+
totalItems: known,
|
|
79
|
+
pageSize,
|
|
80
|
+
showSummary: variant === "numbered",
|
|
81
|
+
openEnded: known === void 0,
|
|
82
|
+
"data-paging-variant": variant
|
|
83
|
+
}), dots ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Paragraph, {
|
|
58
84
|
color: "$color11",
|
|
59
85
|
margin: "$0",
|
|
60
86
|
testID: "backoffice-list-range",
|
|
61
|
-
children: t("list.
|
|
62
|
-
|
|
87
|
+
children: t("list.range", {
|
|
88
|
+
start,
|
|
89
|
+
end: Math.min(end, known !== null && known !== void 0 ? known : end),
|
|
63
90
|
total: known,
|
|
64
|
-
defaultValue: "{{
|
|
91
|
+
defaultValue: "{{start}}\u2013{{end}} of {{total}}"
|
|
65
92
|
})
|
|
66
|
-
}) : null
|
|
67
|
-
gap: "$3",
|
|
68
|
-
alignItems: "center",
|
|
69
|
-
flexWrap: "wrap",
|
|
70
|
-
children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.ToggleGroup, {
|
|
71
|
-
"aria-label": t("list.pageSize", "Page size"),
|
|
72
|
-
type: "single",
|
|
73
|
-
value: String(step),
|
|
74
|
-
options: LIST_PAGE_SIZES.map(function (size) {
|
|
75
|
-
return {
|
|
76
|
-
label: String(size),
|
|
77
|
-
value: String(size)
|
|
78
|
-
};
|
|
79
|
-
}),
|
|
80
|
-
onChange: function onChange(value) {
|
|
81
|
-
var next = Number(Array.isArray(value) ? value[0] : value);
|
|
82
|
-
if (!next || next === step) return;
|
|
83
|
-
onStepChange(next);
|
|
84
|
-
onPaginationChange({
|
|
85
|
-
pageIndex: 0,
|
|
86
|
-
pageSize: next
|
|
87
|
-
});
|
|
88
|
-
}
|
|
89
|
-
}), more ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Button, {
|
|
90
|
-
outlined: true,
|
|
91
|
-
testID: "backoffice-list-load-more",
|
|
92
|
-
onPress: function onPress() {
|
|
93
|
-
return onPaginationChange({
|
|
94
|
-
pageIndex: 0,
|
|
95
|
-
pageSize: pagination.pageSize + step
|
|
96
|
-
});
|
|
97
|
-
},
|
|
98
|
-
children: t("list.loadMore", "Load More")
|
|
99
|
-
}) : null]
|
|
100
|
-
})]
|
|
93
|
+
}) : null]
|
|
101
94
|
});
|
|
102
95
|
}
|
|
103
96
|
//# sourceMappingURL=list-paging.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","list_paging_exports","
|
|
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","list_paging_exports","LIST_DOT_PAGES","LIST_PAGE_SIZE","ListPaging","module","exports","import_jsx_runtime","require","import_components","import_theme","import_react_i18next","import_i18n","param","pagination","onPaginationChange","shown","total","_pagination_totalCount","t","useTranslation","BACKOFFICE_I18N_NAMESPACE","compact","useLayoutSizeClass","pageIndex","pageSize","known","Math","max","totalCount","pages","ceil","goTo","goTo2","page"],"sources":["../../../src/list/list-paging.tsx"],"sourcesContent":[null],"mappings":"AAQA,YAAS;;AAET,IAAAA,SAAS,GAAAC,MAAA,CAAAC,cAA0B;AACnC,IAAAC,gBAAS,GAAAF,MAAA,CAAAG,wBAAsB;AAC/B,IAAAC,iBAAS,GAAAJ,MAAA,CAAAK,mBAAiC;AAmCtC,IAAAC,YAAA,GAAAN,MAAA,CAAAO,SAAA,CAAAC,cAAA;AAhCG,IAAAC,QAAM,GAAAA,CAAAC,MAAA,EAAiBC,GAAA;EAGvB,KAAM,IAAAC,IAAA,IAAAD,GAAA,EASNZ,SAAS,CAAAW,MAAW,EAAEE,IAAA;IAAAC,GAAA,EAAYF,GAAA,CAAAC,IAAA;IAAAE,UAAoB;EAAO;AAClE;AACA,IAAAC,WAAM,GAAUA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAmBC,IAAA,KAAM;EACzC,IAAAF,IAAQ,WAAWA,IAAA,KAAS,QAAI,WAAAA,IAAA;IAChC,KAAM,IAAAG,GAAQ,IAAAhB,iBAAoB,CAAAa,IAAA,GAGlC,IAAM,CAAAX,YACJ,CAAAe,IAAU,CAAAL,EAAA,EAAAI,GACN,KAAKA,GAAI,KAAGF,MAAK,EAEnBnB,SAAY,CAAAiB,EAAA,EAAAI,GAAO;MAAAP,GAAA,EAAAA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAjB,gBAAA,CAAAe,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EAEvB;EACA,OAAME,EAAA;AACN;AACA,IAAAM,YAAa,GAAAC,GAAA,IAAWR,WAAU,CAAAhB,SAAa,iBAAS;EAAAyB,KAAA;AAAA,IAAAD,GAAA;AACxD,IAAAE,mBAAgB,GAAO;AAEvBhB,QAAA,CACEgB,mBAAA,EAAC;EACCC,cAAA,EAAAA,CAAA,KAAAA,cAAA;EAAAC,cAAC,EAAAA,CAAA,KAAAA,cAAA;EAAAC,UAAA,EAAAA,CAAA,KAAAA;AAAA;AACCC,MAAA,CAAAC,OACA,GAAOR,YAAA,CAAAG,mBAAA;AAAA,IAAAM,kBACD,GAAAC,OAAY;AAAA,IAAAC,iBAClB,GAAcD,OAAA;AAAA,IAAAE,YACd,GAAAF,OAAW;AAAA,IAAAG,oBACC,GAAAH,OAAA;AAAA,IAAAI,WACZ,GAAAJ,OAAA;AAAA,IAAAL,cACA,GAAa;AAAY,IAAAD,cACzB,GAAW;AAAU,SACrBE,WAAAS,KAAA;EAAqB;IAAAC,UAAA;IAAAC,kBAAA;IAAAC,KAAA;IAAAC;EAAA,IAAAJ,KAAA;EAAA,IACvBK,sBAAA;EAAA,IACC;IAAAC;EAAA,CACC,OAAAR,oBAAC,CAAAS,cAAgB,EAAAR,WAAW,CAAAS,yBAAmB;EAC5B,IACfC,OAAA,OAAAZ,YAAA,CAAAa,kBAAA;EAAA,IACA;IAAAC,SAAU;IAAAC;EAAS,IAAAX,UAAY;EAAA,IAC/BY,KAAA,GAAOC,IAAA,CAAAC,GAAA,EAAAV,sBAAA,GAAAJ,UAAA,CAAAe,UAAA,cAAAX,sBAAA,cAAAA,sBAAA,MAAAD,KAAA,aAAAA,KAAA,cAAAA,KAAA;EAAA,IACPa,KAAA,GAAAJ,KAAA,KAAc,SAAAC,IAAA,CAAAC,GAAA,IAAAD,IAAA,CAAAI,IAAA,CAAAL,KAAA,GAAAD,QAAA,KAAAD,SAAA,IAAAR,KAAA,IAAAS,QAAA;EAAA,IACfK,KACH,IACE;EAAA,IACNE,IAAA,YAAAC,MAAAC,IAAA;IAEJ,OAAAnB,kBAAA","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@multiplatform.one/backoffice",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.47.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.47.0",
|
|
75
|
+
"@multiplatform.one/forms": "^7.47.0",
|
|
76
|
+
"@multiplatform.one/frappe": "^7.47.0",
|
|
77
|
+
"@multiplatform.one/frappe-ui": "^7.47.0",
|
|
78
|
+
"@multiplatform.one/i18n": "^7.47.0",
|
|
79
|
+
"@multiplatform.one/platform": "^7.47.0",
|
|
80
|
+
"@multiplatform.one/store": "^7.47.0",
|
|
81
|
+
"@multiplatform.one/table": "^7.47.0",
|
|
82
|
+
"@multiplatform.one/theme": "^7.47.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.47.0",
|
|
88
|
+
"@multiplatform.one/test-utils": "7.47.0",
|
|
89
89
|
"@tamagui/build": "2.7.6",
|
|
90
90
|
"@testing-library/react": "^16.3.3",
|
|
91
91
|
"@types/react-dom": "^19.2.3",
|
|
@@ -79,8 +79,7 @@ export function BackofficeAwesomebar({ focusRef }: BackofficeAwesomebarProps = {
|
|
|
79
79
|
)}
|
|
80
80
|
{showShortcutHint && (
|
|
81
81
|
<XStack
|
|
82
|
-
|
|
83
|
-
borderColor="$borderColor"
|
|
82
|
+
{...knobProps.surface}
|
|
84
83
|
backgroundColor="$color2"
|
|
85
84
|
borderRadius="$2"
|
|
86
85
|
paddingHorizontal="$1.5"
|
|
@@ -103,7 +103,9 @@ function CommandPaletteSurface({ open, onOpenChange }: CommandPaletteProps) {
|
|
|
103
103
|
const wasOpenRef = useRef(false);
|
|
104
104
|
if (open && !wasOpenRef.current && isWeb && typeof document !== "undefined") {
|
|
105
105
|
restoreFocusRef.current =
|
|
106
|
-
|
|
106
|
+
typeof HTMLElement !== "undefined" && document.activeElement instanceof HTMLElement
|
|
107
|
+
? document.activeElement
|
|
108
|
+
: null;
|
|
107
109
|
}
|
|
108
110
|
wasOpenRef.current = open;
|
|
109
111
|
|
|
@@ -150,7 +150,7 @@ describe("UserMenu", () => {
|
|
|
150
150
|
it("keeps a signed-in user whose User record the bench refuses in the menu", async () => {
|
|
151
151
|
userReadStatus = 403;
|
|
152
152
|
renderMenu();
|
|
153
|
-
expect(await screen.
|
|
153
|
+
expect((await screen.findAllByRole("button", { name: "User menu" })).length).toBeGreaterThan(0);
|
|
154
154
|
expect(screen.queryByRole("button", { name: "Log in" })).toBeNull();
|
|
155
155
|
expect(screen.getAllByText("jane@example.com").length).toBeGreaterThan(0);
|
|
156
156
|
expect(item("Log Out")).toBeTruthy();
|
|
@@ -164,7 +164,7 @@ describe("UserMenu", () => {
|
|
|
164
164
|
});
|
|
165
165
|
renderMenu({ auth: { login } });
|
|
166
166
|
fireEvent.click(await screen.findByRole("button", { name: "Log in" }));
|
|
167
|
-
expect(await screen.
|
|
167
|
+
expect((await screen.findAllByRole("button", { name: "User menu" })).length).toBeGreaterThan(0);
|
|
168
168
|
expect(screen.queryByRole("button", { name: "Log in" })).toBeNull();
|
|
169
169
|
});
|
|
170
170
|
|
|
@@ -923,7 +923,7 @@ export function DocFormScreen({
|
|
|
923
923
|
</YStack>
|
|
924
924
|
)}
|
|
925
925
|
|
|
926
|
-
<ScrollView flex={1}>
|
|
926
|
+
<ScrollView flex={1} minHeight={0}>
|
|
927
927
|
{sidebarStacked ? (
|
|
928
928
|
// Compact: form body → metadata accordion → timeline (the accordion
|
|
929
929
|
// must not hide below the activity feed's long scroll).
|
|
@@ -194,6 +194,35 @@ describe("FormToolbar", () => {
|
|
|
194
194
|
expect(onNextDoc).toHaveBeenCalledTimes(1);
|
|
195
195
|
});
|
|
196
196
|
|
|
197
|
+
it("puts back in the phone top bar with Save and the chromeless menu, the title under it (LC-145)", () => {
|
|
198
|
+
layout.size = "compact";
|
|
199
|
+
const onNavigate = vi.fn();
|
|
200
|
+
renderWithProviders(
|
|
201
|
+
<FormToolbar
|
|
202
|
+
{...props({
|
|
203
|
+
isDirty: true,
|
|
204
|
+
indicator: "notSaved",
|
|
205
|
+
onNavigate,
|
|
206
|
+
menuItems: [{ key: "reload", label: "Reload", onSelect: vi.fn() }],
|
|
207
|
+
})}
|
|
208
|
+
/>,
|
|
209
|
+
);
|
|
210
|
+
const bar = screen.getByTestId("screen-toolbar");
|
|
211
|
+
const back = screen.getByTestId("form-toolbar-back");
|
|
212
|
+
expect(bar.contains(back)).toBe(true);
|
|
213
|
+
expect(bar.contains(screen.getByTestId("form-toolbar-save"))).toBe(true);
|
|
214
|
+
expect(bar.contains(screen.getByTestId("form-toolbar-menu"))).toBe(true);
|
|
215
|
+
const title = screen.getByRole("heading", { name: "SO-0001" });
|
|
216
|
+
expect(bar.contains(title)).toBe(false);
|
|
217
|
+
expect(bar.compareDocumentPosition(title) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
|
|
218
|
+
expect(screen.getByTestId("form-toolbar-menu").getAttribute("data-top-bar-control")).toBe(
|
|
219
|
+
"menu",
|
|
220
|
+
);
|
|
221
|
+
expect(back.getAttribute("data-top-bar-control")).toBe("back");
|
|
222
|
+
fireEvent.click(back);
|
|
223
|
+
expect(onNavigate).toHaveBeenCalledWith("/backoffice/sales-order");
|
|
224
|
+
});
|
|
225
|
+
|
|
197
226
|
it("pages prev/next and disables the boundary arrow instead of hiding it", () => {
|
|
198
227
|
const onPrevDoc = vi.fn();
|
|
199
228
|
const onNextDoc = vi.fn();
|
package/src/form/FormToolbar.tsx
CHANGED
|
@@ -5,6 +5,9 @@ import {
|
|
|
5
5
|
DropdownMenu,
|
|
6
6
|
H1,
|
|
7
7
|
H2,
|
|
8
|
+
PageBackButton,
|
|
9
|
+
PageMenuButton,
|
|
10
|
+
ScreenToolbar,
|
|
8
11
|
XStack,
|
|
9
12
|
YStack,
|
|
10
13
|
type BreadcrumbItem,
|
|
@@ -372,13 +375,22 @@ export function FormToolbar({
|
|
|
372
375
|
const menuButton =
|
|
373
376
|
entries.length > 0 ? (
|
|
374
377
|
<DropdownMenu items={entries} placement="bottom-end">
|
|
375
|
-
|
|
376
|
-
size
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
378
|
+
{isNarrow ? (
|
|
379
|
+
// LC-145: the top bar's "…" shares back's chromeless recipe and size.
|
|
380
|
+
<PageMenuButton
|
|
381
|
+
edge="end"
|
|
382
|
+
aria-label={t("moreActions", "More actions")}
|
|
383
|
+
testID="form-toolbar-menu"
|
|
384
|
+
/>
|
|
385
|
+
) : (
|
|
386
|
+
<Button
|
|
387
|
+
size={knobProps.sizeToken}
|
|
388
|
+
outlined
|
|
389
|
+
icon={<DotsThreeIcon size={iconSize} weight="bold" />}
|
|
390
|
+
aria-label={t("moreActions", "More actions")}
|
|
391
|
+
testID="form-toolbar-menu"
|
|
392
|
+
/>
|
|
393
|
+
)}
|
|
382
394
|
</DropdownMenu>
|
|
383
395
|
) : null;
|
|
384
396
|
|
|
@@ -397,42 +409,71 @@ export function FormToolbar({
|
|
|
397
409
|
) : null;
|
|
398
410
|
|
|
399
411
|
if (isNarrow) {
|
|
412
|
+
// LC-145: back leads the top bar on the row Save and "…" trail, and the
|
|
413
|
+
// title starts directly under it. Back goes to the list crumb.
|
|
414
|
+
const back = [...breadcrumbs].reverse().find((crumb) => crumb.href);
|
|
400
415
|
return (
|
|
401
|
-
<
|
|
402
|
-
alignItems="center"
|
|
403
|
-
gap="$3"
|
|
416
|
+
<YStack
|
|
404
417
|
{...knobProps.panelPadding}
|
|
405
|
-
|
|
418
|
+
gap="$2"
|
|
419
|
+
flexShrink={0}
|
|
420
|
+
backgroundColor="$background"
|
|
406
421
|
testID="form-toolbar"
|
|
407
422
|
>
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
{
|
|
423
|
-
|
|
423
|
+
<ScreenToolbar
|
|
424
|
+
leading={
|
|
425
|
+
back?.href ? (
|
|
426
|
+
<PageBackButton
|
|
427
|
+
label={back.label}
|
|
428
|
+
onPress={() => onNavigate(back.href as string)}
|
|
429
|
+
aria-label={t("backToList", "Back to {{doctype}} list", { doctype: back.label })}
|
|
430
|
+
testID="form-toolbar-back"
|
|
431
|
+
/>
|
|
432
|
+
) : null
|
|
433
|
+
}
|
|
434
|
+
trailing={
|
|
435
|
+
<>
|
|
436
|
+
{saveButton}
|
|
437
|
+
{menuButton}
|
|
438
|
+
</>
|
|
439
|
+
}
|
|
440
|
+
// The block pads the bar and the title alike, so the bar takes no
|
|
441
|
+
// inset or bleed of its own and back stays on the title's line.
|
|
442
|
+
padding={0}
|
|
443
|
+
marginHorizontal={0}
|
|
444
|
+
/>
|
|
445
|
+
<XStack alignItems="center" gap="$3">
|
|
446
|
+
{image ? (
|
|
447
|
+
<Avatar src={image} name={title} circular={false} size="$6" flexShrink={0} />
|
|
424
448
|
) : null}
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
449
|
+
<YStack flex={1} minWidth={0} gap="$1">
|
|
450
|
+
<H2 color="$color12" numberOfLines={1} margin={0}>
|
|
451
|
+
{title}
|
|
452
|
+
</H2>
|
|
453
|
+
{(showIndicator && chip) || cluster ? (
|
|
454
|
+
<XStack alignItems="center" gap="$2" flexWrap="wrap">
|
|
455
|
+
{showIndicator && chip && (
|
|
456
|
+
<Chip size="$2" variant="subtle" color={chip.color}>
|
|
457
|
+
{chip.label}
|
|
458
|
+
</Chip>
|
|
459
|
+
)}
|
|
460
|
+
{cluster}
|
|
461
|
+
</XStack>
|
|
462
|
+
) : null}
|
|
463
|
+
</YStack>
|
|
429
464
|
</XStack>
|
|
430
|
-
</
|
|
465
|
+
</YStack>
|
|
431
466
|
);
|
|
432
467
|
}
|
|
433
468
|
|
|
434
469
|
return (
|
|
435
|
-
<YStack
|
|
470
|
+
<YStack
|
|
471
|
+
{...knobProps.gap}
|
|
472
|
+
{...knobProps.panelPadding}
|
|
473
|
+
flexShrink={0}
|
|
474
|
+
backgroundColor="$background"
|
|
475
|
+
testID="form-toolbar"
|
|
476
|
+
>
|
|
436
477
|
<Breadcrumbs items={breadcrumbs} onNavigate={onNavigate} />
|
|
437
478
|
<XStack alignItems="center" flexWrap="wrap" {...knobProps.gap}>
|
|
438
479
|
<XStack alignItems="center" gap="$3" flex={1} minWidth={0}>
|
|
@@ -154,7 +154,7 @@ export function useFormBuilderDrag({
|
|
|
154
154
|
? describeDragState("drop", session, state.board, label)
|
|
155
155
|
: describeCancel(session, state.board, label),
|
|
156
156
|
);
|
|
157
|
-
if (session.mode === "keyboard")
|
|
157
|
+
if (session.mode === "keyboard" && typeof document !== "undefined")
|
|
158
158
|
requestAnimationFrame(() => {
|
|
159
159
|
document
|
|
160
160
|
.querySelector<HTMLElement>(`[data-sortable-handle="${session.field.key}"]`)
|
|
@@ -181,6 +181,11 @@ export function useFormBuilderDrag({
|
|
|
181
181
|
y: number,
|
|
182
182
|
session: DragSession,
|
|
183
183
|
): { target: KanbanDropTarget; overColumn: boolean } {
|
|
184
|
+
if (typeof document === "undefined")
|
|
185
|
+
return {
|
|
186
|
+
target: { columnId: session.sourceColumnId, index: session.sourceIndex },
|
|
187
|
+
overColumn: false,
|
|
188
|
+
};
|
|
184
189
|
const element = document.elementFromPoint(x, y)?.closest<HTMLElement>("[data-fb-column]");
|
|
185
190
|
const columnId = element?.getAttribute("data-fb-column");
|
|
186
191
|
if (!element || !columnId || !latest.current.board.some((c) => c.id === columnId))
|
package/src/i18n/en.ts
CHANGED
|
@@ -380,6 +380,8 @@ export const en = {
|
|
|
380
380
|
savedToast: "Saved",
|
|
381
381
|
submittedToast: "Submitted",
|
|
382
382
|
cancelledToast: "Cancelled",
|
|
383
|
+
backToList: "Back to {{doctype}} list",
|
|
384
|
+
moreActions: "More actions",
|
|
383
385
|
prevDoc: "Previous document",
|
|
384
386
|
nextDoc: "Next document",
|
|
385
387
|
validationSummary_one: "Cannot save — {{count}} required field is missing.",
|
|
@@ -496,13 +498,11 @@ export const en = {
|
|
|
496
498
|
likedBy: "Liked By",
|
|
497
499
|
likedColumn: "Liked",
|
|
498
500
|
me: "Me",
|
|
499
|
-
loadMore: "Load More",
|
|
500
501
|
metaError: "Could not load {{doctype}}",
|
|
501
502
|
more: "More actions",
|
|
502
503
|
new: "New {{doctype}}",
|
|
503
504
|
newShort: "New",
|
|
504
|
-
|
|
505
|
-
rangeOf: "{{shown}} of {{total}}",
|
|
505
|
+
range: "{{start}}–{{end}} of {{total}}",
|
|
506
506
|
noTags: "No Tags",
|
|
507
507
|
notPermitted: "You can't open the {{doctype}} list",
|
|
508
508
|
refresh: "Refresh",
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
YStack,
|
|
21
21
|
notify,
|
|
22
22
|
} from "@multiplatform.one/components";
|
|
23
|
-
import { useLayoutSizeClass, useResolvedKnobs } from "@multiplatform.one/theme";
|
|
23
|
+
import { PageGutter, useLayoutSizeClass, useResolvedKnobs } from "@multiplatform.one/theme";
|
|
24
24
|
// Catalog action Button — `accent` renders the active accent intent, the
|
|
25
25
|
// house expression of the one page primary (LC-05 ONE-EMPHASIS; quick entry
|
|
26
26
|
// "Create" precedent). The components Button above stays for neutral chrome.
|
|
@@ -95,7 +95,7 @@ import {
|
|
|
95
95
|
import { toggleFacetFilter } from "./sidebar-stats";
|
|
96
96
|
import { ListFilterBar } from "./ListFilterBar";
|
|
97
97
|
import { ListToolsButton } from "./list-tools-sheet";
|
|
98
|
-
import {
|
|
98
|
+
import { LIST_PAGE_SIZE, ListPaging } from "./list-paging";
|
|
99
99
|
import { SortControl } from "./filter-sort";
|
|
100
100
|
import { ListSidebar } from "./ListSidebar";
|
|
101
101
|
import { useShellSidebarPanel } from "../shell/shellSidebarSlot";
|
|
@@ -282,9 +282,7 @@ export function DoctypeListScreen({
|
|
|
282
282
|
const [searchText, setSearchText] = useState("");
|
|
283
283
|
const [loadedCount, setLoadedCount] = useState(0);
|
|
284
284
|
// Last page size the user picked — survives the filter/sort remounts.
|
|
285
|
-
const pageSizeRef = useRef<number>(pageSize ??
|
|
286
|
-
// Desk paging: the size Load More adds, and the one the toggle shows.
|
|
287
|
-
const [pageStep, setPageStep] = useState<number>(pageSize ?? LIST_PAGE_SIZES[0]);
|
|
285
|
+
const pageSizeRef = useRef<number>(pageSize ?? LIST_PAGE_SIZE);
|
|
288
286
|
|
|
289
287
|
// Always-ANDed host filters: joined into every query (table injection,
|
|
290
288
|
// live count, facet stats) but invisible to the user filter chrome —
|
|
@@ -1128,9 +1126,17 @@ export function DoctypeListScreen({
|
|
|
1128
1126
|
);
|
|
1129
1127
|
|
|
1130
1128
|
return (
|
|
1131
|
-
<YStack
|
|
1129
|
+
<YStack
|
|
1130
|
+
flex={1}
|
|
1131
|
+
minHeight={0}
|
|
1132
|
+
{...knobProps.gap}
|
|
1133
|
+
{...knobProps.panelPadding}
|
|
1134
|
+
// LC-146: on a phone the list scrolls edge to edge, so the header and
|
|
1135
|
+
// the list body each take the gutter instead of the screen.
|
|
1136
|
+
{...(compactChrome ? { paddingHorizontal: 0 } : {})}
|
|
1137
|
+
>
|
|
1132
1138
|
{compactChrome ? (
|
|
1133
|
-
compactHeader
|
|
1139
|
+
<YStack paddingHorizontal={knobProps.panelPadding.padding}>{compactHeader}</YStack>
|
|
1134
1140
|
) : (
|
|
1135
1141
|
<PageHeader
|
|
1136
1142
|
gap="$2"
|
|
@@ -1232,17 +1238,11 @@ export function DoctypeListScreen({
|
|
|
1232
1238
|
// The list's own count (one get_count per filter state)
|
|
1233
1239
|
// feeds the paging readout; the table asks for none.
|
|
1234
1240
|
fetchTotalCount={false}
|
|
1235
|
-
//
|
|
1236
|
-
// endless scroll
|
|
1241
|
+
// One page at a time through MPO's Pagination, not an
|
|
1242
|
+
// endless scroll; the pager states the range itself.
|
|
1237
1243
|
showPageRange={false}
|
|
1238
1244
|
renderPagination={(paging) => (
|
|
1239
|
-
<ListPaging
|
|
1240
|
-
{...paging}
|
|
1241
|
-
step={pageStep}
|
|
1242
|
-
onStepChange={setPageStep}
|
|
1243
|
-
shown={loadedCount}
|
|
1244
|
-
total={count.value}
|
|
1245
|
-
/>
|
|
1245
|
+
<ListPaging {...paging} shown={loadedCount} total={count.value} />
|
|
1246
1246
|
)}
|
|
1247
1247
|
// ONE FILTER SYSTEM (MOD-04 / LC-16): the list chrome is
|
|
1248
1248
|
// the single filtering authority; tuples reach the table
|
|
@@ -1266,7 +1266,16 @@ export function DoctypeListScreen({
|
|
|
1266
1266
|
</YStack>
|
|
1267
1267
|
</XStack>
|
|
1268
1268
|
);
|
|
1269
|
-
|
|
1269
|
+
// LC-146: on a phone the scroll viewport reaches the screen edges and
|
|
1270
|
+
// hands the list the page gutter, so the list rows run edge to edge.
|
|
1271
|
+
const gutter = knobProps.panelPadding.padding as string;
|
|
1272
|
+
return compactChrome ? (
|
|
1273
|
+
<ScrollView flex={1} minHeight={0} testID="backoffice-list-scroll">
|
|
1274
|
+
<YStack paddingHorizontal={gutter as "$4"} flexGrow={1} flexShrink={0} flexBasis="auto">
|
|
1275
|
+
<PageGutter inset={gutter}>{listBody}</PageGutter>
|
|
1276
|
+
</YStack>
|
|
1277
|
+
</ScrollView>
|
|
1278
|
+
) : (
|
|
1270
1279
|
<ScrollView flex={1} minHeight={0} testID="backoffice-list-scroll">
|
|
1271
1280
|
{listBody}
|
|
1272
1281
|
</ScrollView>
|