@etsoo/react 1.7.26 → 1.7.28

package/__tests__/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "ES2019",
+        "target": "ES2020",
         "module": "ESNext",
         "allowJs": true,
         "skipLibCheck": true,
@@ -8,7 +8,7 @@
         "allowSyntheticDefaultImports": true,
         "strict": true,
         "forceConsistentCasingInFileNames": true,
-        "moduleResolution": "node",
+        "moduleResolution": "Bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
         "noEmit": true,

package/lib/app/ReactUtils.js

@@ -54,7 +54,6 @@ export var ReactUtils;
      * @param cancelable Cancelable
      */
     function triggerChange(input, value, cancelable) {
-        var _a;
         // Radio type not supported
         if (input.type === 'radio')
             return;
@@ -65,10 +64,10 @@ export var ReactUtils;
         // input.value = newValue will not trigger the change event
         // input type = 'hidden' will also not trigger the event
         // https://coryrylan.com/blog/trigger-input-updates-with-react-controlled-inputs
-        var nativeInputValueSetter = (_a = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, property)) === null || _a === void 0 ? void 0 : _a.set;
+        var nativeInputValueSetter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, property)?.set;
         if (checked) {
             const checkedValue = input.value == value;
-            nativeInputValueSetter === null || nativeInputValueSetter === void 0 ? void 0 : nativeInputValueSetter.call(input, checkedValue);
+            nativeInputValueSetter?.call(input, checkedValue);
             const clickEvent = new Event('click', {
                 bubbles: true,
                 cancelable
@@ -76,7 +75,7 @@ export var ReactUtils;
             input.dispatchEvent(clickEvent);
         }
         else {
-            nativeInputValueSetter === null || nativeInputValueSetter === void 0 ? void 0 : nativeInputValueSetter.call(input, value);
+            nativeInputValueSetter?.call(input, value);
             const inputEvent = new Event('change', {
                 bubbles: true,
                 cancelable
@@ -92,7 +91,6 @@ export var ReactUtils;
      * @param callback Callback to update refs' value, return false continue to process
      */
     function updateRefs(refs, data, callback) {
-        var _a;
         const local = callback == null
             ? undefined
             : typeof callback === 'function'
@@ -103,7 +101,7 @@ export var ReactUtils;
         let k;
         for (k in refs) {
             const ref = refs[k];
-            const item = ref === null || ref === void 0 ? void 0 : ref.current;
+            const item = ref?.current;
             if (item == null)
                 continue;
             if (local && local(item, data[k]) !== false) {
@@ -116,10 +114,10 @@ export var ReactUtils;
                 const isDateTime = item.type === 'datetime-local';
                 if (isDateTime || item.type === 'date') {
                     item.value =
-                        (_a = DateUtils.formatForInput(value, isDateTime ? false : undefined)) !== null && _a !== void 0 ? _a : '';
+                        DateUtils.formatForInput(value, isDateTime ? false : undefined) ?? '';
                 }
                 else {
-                    item.value = `${value !== null && value !== void 0 ? value : ''}`;
+                    item.value = `${value ?? ''}`;
                 }
             }
             else {
@@ -149,7 +147,7 @@ export var ReactUtils;
         let k;
         for (k in refs) {
             const ref = refs[k];
-            const item = ref === null || ref === void 0 ? void 0 : ref.current;
+            const item = ref?.current;
             if (item == null)
                 continue;
             if (local) {

package/lib/components/GridLoader.js

@@ -31,6 +31,6 @@ export function GridDataGetData(data, template) {
         DomUtils.clearFormData(data);
     }
     // Conditions
-    const conditions = data == null ? {} : DomUtils.dataAs(data, template !== null && template !== void 0 ? template : {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
+    const conditions = data == null ? {} : DomUtils.dataAs(data, template ?? {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
     return conditions;
 }

package/lib/components/ScrollerGrid.js

@@ -149,20 +149,16 @@ export const ScrollerGrid = (props) => {
             setRows(newRows);
         },
         scrollTo(params) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.scrollTo(params);
+            ref.current?.scrollTo(params);
         },
         scrollToItem(params) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.scrollToItem(params);
+            ref.current?.scrollToItem(params);
         },
         scrollToRef(scrollOffset) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.scrollTo({ scrollLeft: 0, scrollTop: scrollOffset });
+            ref.current?.scrollTo({ scrollLeft: 0, scrollTop: scrollOffset });
         },
         scrollToItemRef(index, align) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.scrollToItem({ rowIndex: index, align });
+            ref.current?.scrollToItem({ rowIndex: index, align });
         },
         select(rowIndex) {
             // Select only one item
@@ -202,16 +198,13 @@ export const ScrollerGrid = (props) => {
         },
         reset,
         resetAfterColumnIndex(index, shouldForceUpdate) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.resetAfterColumnIndex(index, shouldForceUpdate);
+            ref.current?.resetAfterColumnIndex(index, shouldForceUpdate);
         },
         resetAfterIndices(params) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.resetAfterIndices(params);
+            ref.current?.resetAfterIndices(params);
         },
         resetAfterRowIndex(index, shouldForceUpdate) {
-            var _a;
-            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.resetAfterRowIndex(index, shouldForceUpdate);
+            ref.current?.resetAfterRowIndex(index, shouldForceUpdate);
         }
     };
     React.useImperativeHandle(mRef, () => instance, [rows]);
@@ -222,8 +215,7 @@ export const ScrollerGrid = (props) => {
     }, []);
     // Force update to work with the new width and rowHeight
     React.useEffect(() => {
-        var _a;
-        (_a = ref.current) === null || _a === void 0 ? void 0 : _a.resetAfterIndices({
+        ref.current?.resetAfterIndices({
             columnIndex: 0,
             rowIndex: 0,
             shouldForceUpdate: true

package/lib/components/ScrollerList.js

@@ -186,5 +186,5 @@ export const ScrollerList = (props) => {
             loadDataLocal();
     }
     // Layout
-    return typeof itemSize === 'function' ? (React.createElement(VariableSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => { var _a; return (_a = DataTypes.getIdValue1(data, idField)) !== null && _a !== void 0 ? _a : index; }, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest }, itemRendererLocal)) : (React.createElement(FixedSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => { var _a; return (_a = DataTypes.getIdValue1(data, idField)) !== null && _a !== void 0 ? _a : index; }, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest }, itemRendererLocal));
+    return typeof itemSize === 'function' ? (React.createElement(VariableSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => DataTypes.getIdValue1(data, idField) ?? index, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest }, itemRendererLocal)) : (React.createElement(FixedSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => DataTypes.getIdValue1(data, idField) ?? index, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest }, itemRendererLocal));
 };

package/lib/states/CultureState.js

@@ -24,7 +24,7 @@ export class CultureState {
      */
     constructor(item) {
         // Default
-        const defaultItem = item !== null && item !== void 0 ? item : {};
+        const defaultItem = item ?? {};
         // Load resources
         if (item != null && typeof item.resources !== 'object')
             item.resources().then((result) => (item.resources = result));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.7.26",
+    "version": "1.7.28",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,12 +50,9 @@
         "@emotion/css": "^11.11.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.0",
-        "@etsoo/appscript": "^1.4.76",
-        "@etsoo/notificationbase": "^1.1.35",
-        "@etsoo/shared": "^1.2.26",
-        "@types/react": "^18.2.60",
-        "@types/react-dom": "^18.2.19",
-        "@types/react-window": "^1.8.8",
+        "@etsoo/appscript": "^1.4.78",
+        "@etsoo/notificationbase": "^1.1.39",
+        "@etsoo/shared": "^1.2.28",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.22.2",
@@ -70,6 +67,9 @@
         "@testing-library/jest-dom": "^6.4.2",
         "@testing-library/react": "^14.2.1",
         "@types/jest": "^29.5.12",
+        "@types/react": "^18.2.61",
+        "@types/react-dom": "^18.2.19",
+        "@types/react-window": "^1.8.8",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.1.2",

package/tsconfig.json

@@ -1,10 +1,10 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
+        "target": "ES2020",
         "module": "ESNext",
         "allowJs": true,
-        "moduleResolution": "node",
+        "moduleResolution": "Bundler",
         "isolatedModules": true,
         "outDir": "./lib",
         "noEmit": false,