@nubitio/devextreme 1.1.1 → 1.1.2

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/index.cjs CHANGED
@@ -16,23 +16,23 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
20
20
  value: mod,
21
21
  enumerable: true
22
22
  }) : target, mod));
23
23
  //#endregion
24
24
  let react = require("react");
25
- react = __toESM(react);
25
+ react = __toESM(react, 1);
26
26
  let _nubitio_crud = require("@nubitio/crud");
27
27
  let devextreme_data_custom_store = require("devextreme/data/custom_store");
28
- devextreme_data_custom_store = __toESM(devextreme_data_custom_store);
28
+ devextreme_data_custom_store = __toESM(devextreme_data_custom_store, 1);
29
29
  let devextreme_react_data_grid = require("devextreme-react/data-grid");
30
- devextreme_react_data_grid = __toESM(devextreme_react_data_grid);
30
+ devextreme_react_data_grid = __toESM(devextreme_react_data_grid, 1);
31
31
  let _nubitio_core = require("@nubitio/core");
32
32
  let _nubitio_ui = require("@nubitio/ui");
33
33
  let react_jsx_runtime = require("react/jsx-runtime");
34
34
  let devextreme_react_form = require("devextreme-react/form");
35
- devextreme_react_form = __toESM(devextreme_react_form);
35
+ devextreme_react_form = __toESM(devextreme_react_form, 1);
36
36
  //#region packages/devextreme/convertDxFilterToNubit.ts
37
37
  function isDxFilterTriplet(value) {
38
38
  return Array.isArray(value) && value.length === 3 && typeof value[0] === "string" && typeof value[1] === "string";
@@ -130,7 +130,8 @@ const DX_DATA_TYPE_BY_KIND = {
130
130
  switch: "boolean"
131
131
  };
132
132
  function resolveDataType(field) {
133
- const fromKind = DX_DATA_TYPE_BY_KIND[(0, _nubitio_crud.getFieldTypeModule)(field.type).controlKind ?? "text"];
133
+ const kind = (0, _nubitio_crud.getFieldTypeModule)(field.type).controlKind ?? "text";
134
+ const fromKind = DX_DATA_TYPE_BY_KIND[kind];
134
135
  if (fromKind) return fromKind;
135
136
  return field.valueType === "number" ? "number" : field.valueType === "date" ? "date" : field.valueType === "datetime" ? "datetime" : field.valueType === "boolean" ? "boolean" : "string";
136
137
  }
@@ -697,7 +698,7 @@ const DX_EDITOR_BY_KIND = {
697
698
  html: "dxTextBox",
698
699
  none: "dxTextBox"
699
700
  };
700
- const OPTION_LIST_KINDS = new Set([
701
+ const OPTION_LIST_KINDS = /* @__PURE__ */ new Set([
701
702
  "select",
702
703
  "radio",
703
704
  "tags"
@@ -741,7 +742,8 @@ const DevExtremeFormView = (0, react.forwardRef)((options, ref) => {
741
742
  const { t } = (0, _nubitio_core.useCoreTranslation)();
742
743
  const httpClient = (0, _nubitio_core.useCoreHttpClient)();
743
744
  const [on, emit] = (0, _nubitio_core.useEvents)();
744
- const scopedFormErrorsEvent = `${_nubitio_crud.FORM_ERRORS_EVENT}:${(0, react.useId)()}`;
745
+ const instanceId = (0, react.useId)();
746
+ const scopedFormErrorsEvent = `${_nubitio_crud.FORM_ERRORS_EVENT}:${instanceId}`;
745
747
  const appliedOperationRef = (0, react.useRef)(null);
746
748
  const [detailDirty, setDetailDirty] = (0, react.useState)(false);
747
749
  const { accessors, formData, detailRows, fieldState, setFieldState, errors, setErrors, detailErrors, setDetailErrors, setNextFormData, setNextDetailRows, setFieldValue, setEditMode, resetUploadSession, resetPrependData, setExistingMedia, clearExistingMedia, upsertUploadedFile } = (0, _nubitio_crud.useFormState)({
@@ -826,7 +828,8 @@ const DevExtremeFormView = (0, react.forwardRef)((options, ref) => {
826
828
  setNextDetailRows([]);
827
829
  setDetailDirty(false);
828
830
  resetPrependData();
829
- setNextFormData(payload ? (0, _nubitio_crud.normalizeFormData)(payload, options.fields, options.adapter, accessors.getPrependDataMap()) : (0, _nubitio_crud.buildEmptyRow)(options.fields));
831
+ const row = payload ? (0, _nubitio_crud.normalizeFormData)(payload, options.fields, options.adapter, accessors.getPrependDataMap()) : (0, _nubitio_crud.buildEmptyRow)(options.fields);
832
+ setNextFormData(row);
830
833
  setEditMode(false);
831
834
  }, [
832
835
  accessors,
@@ -908,7 +911,8 @@ const DevExtremeFormView = (0, react.forwardRef)((options, ref) => {
908
911
  return () => subs.forEach((sub) => sub.unsubscribe());
909
912
  }, [scopedFormErrorsEvent]);
910
913
  const handleDetailRowsChange = (0, react.useCallback)((rows) => {
911
- setNextDetailRows(withDetailRowKeys(rows).map(({ __rowKey, ...row }) => row));
914
+ const normalized = withDetailRowKeys(rows).map(({ __rowKey, ...row }) => row);
915
+ setNextDetailRows(normalized);
912
916
  setDetailDirty(true);
913
917
  }, [setNextDetailRows]);
914
918
  (0, react.useImperativeHandle)(ref, () => ({
@@ -1112,11 +1116,12 @@ const defaultDevExtremeViews = {
1112
1116
  FormView: DevExtremeFormView
1113
1117
  };
1114
1118
  function DevExtremeCrudProvider({ children, views, basePath, syncTheme = true }) {
1119
+ const mergedViews = (0, react.useMemo)(() => ({
1120
+ DataGridView: views?.DataGridView ?? defaultDevExtremeViews.DataGridView,
1121
+ FormView: views?.FormView ?? defaultDevExtremeViews.FormView
1122
+ }), [views?.DataGridView, views?.FormView]);
1115
1123
  return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_nubitio_crud.CrudViewProvider, {
1116
- views: (0, react.useMemo)(() => ({
1117
- DataGridView: views?.DataGridView ?? defaultDevExtremeViews.DataGridView,
1118
- FormView: views?.FormView ?? defaultDevExtremeViews.FormView
1119
- }), [views?.DataGridView, views?.FormView]),
1124
+ views: mergedViews,
1120
1125
  children: [syncTheme ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DevExtremeThemeSync, { basePath }) : null, children]
1121
1126
  });
1122
1127
  }
package/dist/index.d.cts CHANGED
@@ -1,6 +1,5 @@
1
1
  import React from "react";
2
2
  import { CrudViewComponents, DataGridViewOptions, Field, FormDataRecord, FormHandle, FormViewOptions, GridHandle } from "@nubitio/crud";
3
-
4
3
  //#region packages/devextreme/DevExtremeThemeSync.d.ts
5
4
  interface DevExtremeThemeSyncProps {
6
5
  /**
@@ -14,9 +13,7 @@ interface DevExtremeThemeSyncProps {
14
13
  * Swaps DevExtreme base theme CSS when Nubit `data-theme` changes.
15
14
  * Mount once inside `ThemeProvider` (typically via `DevExtremeCrudProvider`).
16
15
  */
17
- declare function DevExtremeThemeSync({
18
- basePath
19
- }: DevExtremeThemeSyncProps): null;
16
+ declare function DevExtremeThemeSync({ basePath }: DevExtremeThemeSyncProps): null;
20
17
  //#endregion
21
18
  //#region packages/devextreme/DevExtremeCrudProvider.d.ts
22
19
  interface DevExtremeCrudProviderProps extends DevExtremeThemeSyncProps {
@@ -29,12 +26,7 @@ interface DevExtremeCrudProviderProps extends DevExtremeThemeSyncProps {
29
26
  /** When false, skip loading dx.light/dx.dark CSS (you import a theme yourself). */
30
27
  syncTheme?: boolean;
31
28
  }
32
- declare function DevExtremeCrudProvider({
33
- children,
34
- views,
35
- basePath,
36
- syncTheme
37
- }: DevExtremeCrudProviderProps): React.JSX.Element;
29
+ declare function DevExtremeCrudProvider({ children, views, basePath, syncTheme }: DevExtremeCrudProviderProps): React.JSX.Element;
38
30
  //#endregion
39
31
  //#region packages/devextreme/DevExtremeDataGridView.d.ts
40
32
  declare const DevExtremeDataGridView: React.ForwardRefExoticComponent<DataGridViewOptions & React.RefAttributes<GridHandle>>;
@@ -100,14 +92,7 @@ interface DevExtremeFormDetailGridProps {
100
92
  detailErrors?: Record<number, Record<string, string>>;
101
93
  onRowsChange: (rows: FormDataRecord[]) => void;
102
94
  }
103
- declare function DevExtremeFormDetailGrid({
104
- fields,
105
- rows,
106
- allowAdding,
107
- allowUpdating,
108
- allowDeleting,
109
- onRowsChange
110
- }: DevExtremeFormDetailGridProps): React.JSX.Element;
95
+ declare function DevExtremeFormDetailGrid({ fields, rows, allowAdding, allowUpdating, allowDeleting, onRowsChange }: DevExtremeFormDetailGridProps): React.JSX.Element;
111
96
  //#endregion
112
97
  //#region packages/devextreme/DevExtremeDetailGridSection.d.ts
113
98
  interface DevExtremeDetailGridSectionProps {
@@ -118,9 +103,6 @@ interface DevExtremeDetailGridSectionProps {
118
103
  * Expanded-row detail grid for DevExtreme DataGrid master-detail.
119
104
  * Loads related rows through ResourceStore and renders a read-only nested grid.
120
105
  */
121
- declare function DevExtremeDetailGridSection({
122
- fields,
123
- url
124
- }: DevExtremeDetailGridSectionProps): React.JSX.Element;
106
+ declare function DevExtremeDetailGridSection({ fields, url }: DevExtremeDetailGridSectionProps): React.JSX.Element;
125
107
  //#endregion
126
108
  export { DevExtremeCrudProvider, type DevExtremeCrudProviderProps, DevExtremeDataGridView, DevExtremeDetailGridSection, type DevExtremeDetailGridSectionProps, DevExtremeFormDetailGrid, type DevExtremeFormDetailGridProps, DevExtremeFormView, DevExtremeThemeSync, type DevExtremeThemeSyncProps, type DxColumnDef, type DxFormItemDef, type RoutingFilterRule, convertDxFilterToNubit, flattenDxFilter, mapFieldsToDxColumns, mapFieldsToDxFormItems, mergeGridFilters };
package/dist/index.d.mts CHANGED
@@ -1,6 +1,5 @@
1
1
  import React from "react";
2
2
  import { CrudViewComponents, DataGridViewOptions, Field, FormDataRecord, FormHandle, FormViewOptions, GridHandle } from "@nubitio/crud";
3
-
4
3
  //#region packages/devextreme/DevExtremeThemeSync.d.ts
5
4
  interface DevExtremeThemeSyncProps {
6
5
  /**
@@ -14,9 +13,7 @@ interface DevExtremeThemeSyncProps {
14
13
  * Swaps DevExtreme base theme CSS when Nubit `data-theme` changes.
15
14
  * Mount once inside `ThemeProvider` (typically via `DevExtremeCrudProvider`).
16
15
  */
17
- declare function DevExtremeThemeSync({
18
- basePath
19
- }: DevExtremeThemeSyncProps): null;
16
+ declare function DevExtremeThemeSync({ basePath }: DevExtremeThemeSyncProps): null;
20
17
  //#endregion
21
18
  //#region packages/devextreme/DevExtremeCrudProvider.d.ts
22
19
  interface DevExtremeCrudProviderProps extends DevExtremeThemeSyncProps {
@@ -29,12 +26,7 @@ interface DevExtremeCrudProviderProps extends DevExtremeThemeSyncProps {
29
26
  /** When false, skip loading dx.light/dx.dark CSS (you import a theme yourself). */
30
27
  syncTheme?: boolean;
31
28
  }
32
- declare function DevExtremeCrudProvider({
33
- children,
34
- views,
35
- basePath,
36
- syncTheme
37
- }: DevExtremeCrudProviderProps): React.JSX.Element;
29
+ declare function DevExtremeCrudProvider({ children, views, basePath, syncTheme }: DevExtremeCrudProviderProps): React.JSX.Element;
38
30
  //#endregion
39
31
  //#region packages/devextreme/DevExtremeDataGridView.d.ts
40
32
  declare const DevExtremeDataGridView: React.ForwardRefExoticComponent<DataGridViewOptions & React.RefAttributes<GridHandle>>;
@@ -100,14 +92,7 @@ interface DevExtremeFormDetailGridProps {
100
92
  detailErrors?: Record<number, Record<string, string>>;
101
93
  onRowsChange: (rows: FormDataRecord[]) => void;
102
94
  }
103
- declare function DevExtremeFormDetailGrid({
104
- fields,
105
- rows,
106
- allowAdding,
107
- allowUpdating,
108
- allowDeleting,
109
- onRowsChange
110
- }: DevExtremeFormDetailGridProps): React.JSX.Element;
95
+ declare function DevExtremeFormDetailGrid({ fields, rows, allowAdding, allowUpdating, allowDeleting, onRowsChange }: DevExtremeFormDetailGridProps): React.JSX.Element;
111
96
  //#endregion
112
97
  //#region packages/devextreme/DevExtremeDetailGridSection.d.ts
113
98
  interface DevExtremeDetailGridSectionProps {
@@ -118,9 +103,6 @@ interface DevExtremeDetailGridSectionProps {
118
103
  * Expanded-row detail grid for DevExtreme DataGrid master-detail.
119
104
  * Loads related rows through ResourceStore and renders a read-only nested grid.
120
105
  */
121
- declare function DevExtremeDetailGridSection({
122
- fields,
123
- url
124
- }: DevExtremeDetailGridSectionProps): React.JSX.Element;
106
+ declare function DevExtremeDetailGridSection({ fields, url }: DevExtremeDetailGridSectionProps): React.JSX.Element;
125
107
  //#endregion
126
108
  export { DevExtremeCrudProvider, type DevExtremeCrudProviderProps, DevExtremeDataGridView, DevExtremeDetailGridSection, type DevExtremeDetailGridSectionProps, DevExtremeFormDetailGrid, type DevExtremeFormDetailGridProps, DevExtremeFormView, DevExtremeThemeSync, type DevExtremeThemeSyncProps, type DxColumnDef, type DxFormItemDef, type RoutingFilterRule, convertDxFilterToNubit, flattenDxFilter, mapFieldsToDxColumns, mapFieldsToDxFormItems, mergeGridFilters };
package/dist/index.mjs CHANGED
@@ -103,7 +103,8 @@ const DX_DATA_TYPE_BY_KIND = {
103
103
  switch: "boolean"
104
104
  };
105
105
  function resolveDataType(field) {
106
- const fromKind = DX_DATA_TYPE_BY_KIND[getFieldTypeModule(field.type).controlKind ?? "text"];
106
+ const kind = getFieldTypeModule(field.type).controlKind ?? "text";
107
+ const fromKind = DX_DATA_TYPE_BY_KIND[kind];
107
108
  if (fromKind) return fromKind;
108
109
  return field.valueType === "number" ? "number" : field.valueType === "date" ? "date" : field.valueType === "datetime" ? "datetime" : field.valueType === "boolean" ? "boolean" : "string";
109
110
  }
@@ -670,7 +671,7 @@ const DX_EDITOR_BY_KIND = {
670
671
  html: "dxTextBox",
671
672
  none: "dxTextBox"
672
673
  };
673
- const OPTION_LIST_KINDS = new Set([
674
+ const OPTION_LIST_KINDS = /* @__PURE__ */ new Set([
674
675
  "select",
675
676
  "radio",
676
677
  "tags"
@@ -714,7 +715,8 @@ const DevExtremeFormView = forwardRef((options, ref) => {
714
715
  const { t } = useCoreTranslation();
715
716
  const httpClient = useCoreHttpClient();
716
717
  const [on, emit] = useEvents();
717
- const scopedFormErrorsEvent = `${FORM_ERRORS_EVENT}:${useId()}`;
718
+ const instanceId = useId();
719
+ const scopedFormErrorsEvent = `${FORM_ERRORS_EVENT}:${instanceId}`;
718
720
  const appliedOperationRef = useRef(null);
719
721
  const [detailDirty, setDetailDirty] = useState(false);
720
722
  const { accessors, formData, detailRows, fieldState, setFieldState, errors, setErrors, detailErrors, setDetailErrors, setNextFormData, setNextDetailRows, setFieldValue, setEditMode, resetUploadSession, resetPrependData, setExistingMedia, clearExistingMedia, upsertUploadedFile } = useFormState({
@@ -799,7 +801,8 @@ const DevExtremeFormView = forwardRef((options, ref) => {
799
801
  setNextDetailRows([]);
800
802
  setDetailDirty(false);
801
803
  resetPrependData();
802
- setNextFormData(payload ? normalizeFormData(payload, options.fields, options.adapter, accessors.getPrependDataMap()) : buildEmptyRow(options.fields));
804
+ const row = payload ? normalizeFormData(payload, options.fields, options.adapter, accessors.getPrependDataMap()) : buildEmptyRow(options.fields);
805
+ setNextFormData(row);
803
806
  setEditMode(false);
804
807
  }, [
805
808
  accessors,
@@ -881,7 +884,8 @@ const DevExtremeFormView = forwardRef((options, ref) => {
881
884
  return () => subs.forEach((sub) => sub.unsubscribe());
882
885
  }, [scopedFormErrorsEvent]);
883
886
  const handleDetailRowsChange = useCallback((rows) => {
884
- setNextDetailRows(withDetailRowKeys(rows).map(({ __rowKey, ...row }) => row));
887
+ const normalized = withDetailRowKeys(rows).map(({ __rowKey, ...row }) => row);
888
+ setNextDetailRows(normalized);
885
889
  setDetailDirty(true);
886
890
  }, [setNextDetailRows]);
887
891
  useImperativeHandle(ref, () => ({
@@ -1085,11 +1089,12 @@ const defaultDevExtremeViews = {
1085
1089
  FormView: DevExtremeFormView
1086
1090
  };
1087
1091
  function DevExtremeCrudProvider({ children, views, basePath, syncTheme = true }) {
1092
+ const mergedViews = useMemo(() => ({
1093
+ DataGridView: views?.DataGridView ?? defaultDevExtremeViews.DataGridView,
1094
+ FormView: views?.FormView ?? defaultDevExtremeViews.FormView
1095
+ }), [views?.DataGridView, views?.FormView]);
1088
1096
  return /* @__PURE__ */ jsxs(CrudViewProvider, {
1089
- views: useMemo(() => ({
1090
- DataGridView: views?.DataGridView ?? defaultDevExtremeViews.DataGridView,
1091
- FormView: views?.FormView ?? defaultDevExtremeViews.FormView
1092
- }), [views?.DataGridView, views?.FormView]),
1097
+ views: mergedViews,
1093
1098
  children: [syncTheme ? /* @__PURE__ */ jsx(DevExtremeThemeSync, { basePath }) : null, children]
1094
1099
  });
1095
1100
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nubitio/devextreme",
3
- "version": "1.1.1",
3
+ "version": "1.1.2",
4
4
  "type": "module",
5
5
  "description": "DevExtreme-backed CRUD views for @nubitio/crud — optional drop-in for licensed DevExtreme customers.",
6
6
  "license": "MIT",
@@ -54,8 +54,8 @@
54
54
  "devextreme-react": ">=24.0.0",
55
55
  "react": "^18.2.0 || ^19.0.0",
56
56
  "react-dom": "^18.2.0 || ^19.0.0",
57
- "@nubitio/core": "^1.1.1",
58
- "@nubitio/crud": "^1.1.1",
59
- "@nubitio/ui": "^1.1.1"
57
+ "@nubitio/core": "^1.1.2",
58
+ "@nubitio/crud": "^1.1.2",
59
+ "@nubitio/ui": "^1.1.2"
60
60
  }
61
61
  }