@etsoo/react 1.7.11 → 1.7.13

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.
Files changed (4) hide show
  1. package/lib/app/ReactUtils.d.ts +2 -2
  2. package/lib/app/ReactUtils.js +11 -9
  3. package/package.json +7 -7
  4. package/src/app/ReactUtils.ts +20 -11
package/lib/app/ReactUtils.d.ts CHANGED
@@ -29,12 +29,12 @@ export declare namespace ReactUtils {
29
29
  * @param data Data
30
30
  * @param callback Callback to update refs' value, return false continue to process
31
31
  */
32
- function updateRefs<D, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T, value: D[keyof D & string]) => void | boolean) | keyof T): void;
32
+ function updateRefs<D extends object, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T, value: D[keyof D & string]) => void | boolean) | keyof T): void;
33
33
  /**
34
34
  * Update data with refs
35
35
  * @param refs Refs
36
36
  * @param data Data
37
37
  * @param callback Callback to return new value
38
38
  */
39
- function updateRefValues<D, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T) => any) | keyof T): void;
39
+ function updateRefValues<D extends object, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T) => any) | keyof T): void;
40
40
  }
package/lib/app/ReactUtils.js CHANGED
@@ -1,4 +1,4 @@
1
- import { DomUtils } from '@etsoo/shared';
1
+ import { DomUtils, Utils } from '@etsoo/shared';
2
2
  /**
3
3
  * React utils
4
4
  */
@@ -92,6 +92,7 @@ export var ReactUtils;
92
92
  * @param callback Callback to update refs' value, return false continue to process
93
93
  */
94
94
  function updateRefs(refs, data, callback) {
95
+ var _a;
95
96
  const local = callback == null
96
97
  ? undefined
97
98
  : typeof callback === 'function'
@@ -105,16 +106,16 @@ export var ReactUtils;
105
106
  const item = ref === null || ref === void 0 ? void 0 : ref.current;
106
107
  if (item == null)
107
108
  continue;
108
- const value = data[k];
109
- if (local && local(item, value) !== false) {
109
+ if (local && local(item, data[k]) !== false) {
110
110
  continue;
111
111
  }
112
112
  else if (item instanceof HTMLInputElement ||
113
- item instanceof HTMLTextAreaElement) {
114
- item.value = `${value !== null && value !== void 0 ? value : ''}`;
113
+ item instanceof HTMLTextAreaElement ||
114
+ item instanceof HTMLSelectElement) {
115
+ item.value = `${(_a = Utils.getNestedValue(data, item.name || k)) !== null && _a !== void 0 ? _a : ''}`;
115
116
  }
116
117
  else {
117
- item.value = value;
118
+ item.value = data[k];
118
119
  }
119
120
  }
120
121
  }
@@ -141,10 +142,11 @@ export var ReactUtils;
141
142
  data[k] = local(item);
142
143
  }
143
144
  else if (item instanceof HTMLInputElement) {
144
- data[k] = DomUtils.getInputValue(item);
145
+ Utils.setNestedValue(data, item.name || k, DomUtils.getInputValue(item));
145
146
  }
146
- else if (item instanceof HTMLTextAreaElement) {
147
- data[k] = item.value;
147
+ else if (item instanceof HTMLTextAreaElement ||
148
+ item instanceof HTMLSelectElement) {
149
+ Utils.setNestedValue(data, item.name || k, item.value);
148
150
  }
149
151
  else {
150
152
  data[k] = item.value;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/react",
3
- "version": "1.7.11",
3
+ "version": "1.7.13",
4
4
  "description": "TypeScript ReactJs UI Independent Framework",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -50,10 +50,10 @@
50
50
  "@emotion/css": "^11.11.2",
51
51
  "@emotion/react": "^11.11.1",
52
52
  "@emotion/styled": "^11.11.0",
53
- "@etsoo/appscript": "^1.4.53",
53
+ "@etsoo/appscript": "^1.4.55",
54
54
  "@etsoo/notificationbase": "^1.1.28",
55
- "@etsoo/shared": "^1.2.12",
56
- "@types/react": "^18.2.21",
55
+ "@etsoo/shared": "^1.2.14",
56
+ "@types/react": "^18.2.22",
57
57
  "@types/react-dom": "^18.2.7",
58
58
  "@types/react-window": "^1.8.5",
59
59
  "react": "^18.2.0",
@@ -63,13 +63,13 @@
63
63
  },
64
64
  "devDependencies": {
65
65
  "@babel/cli": "^7.22.15",
66
- "@babel/core": "^7.22.19",
66
+ "@babel/core": "^7.22.20",
67
67
  "@babel/plugin-transform-runtime": "^7.22.15",
68
- "@babel/preset-env": "^7.22.15",
68
+ "@babel/preset-env": "^7.22.20",
69
69
  "@babel/runtime-corejs3": "^7.22.15",
70
70
  "@testing-library/jest-dom": "^6.1.3",
71
71
  "@testing-library/react": "^14.0.0",
72
- "@types/jest": "^29.5.4",
72
+ "@types/jest": "^29.5.5",
73
73
  "jest": "^29.7.0",
74
74
  "jest-environment-jsdom": "^29.7.0",
75
75
  "ts-jest": "^29.1.1",
package/src/app/ReactUtils.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { DataTypes, DomUtils } from '@etsoo/shared';
1
+ import { DataTypes, DomUtils, Utils } from '@etsoo/shared';
2
2
  import React from 'react';
3
3
 
4
4
  /**
@@ -106,7 +106,7 @@ export namespace ReactUtils {
106
106
  * @param data Data
107
107
  * @param callback Callback to update refs' value, return false continue to process
108
108
  */
109
- export function updateRefs<D, T = HTMLInputElement>(
109
+ export function updateRefs<D extends object, T = HTMLInputElement>(
110
110
  refs: Partial<
111
111
  DataTypes.DI<
112
112
  ReadonlyArray<keyof D & string>,
@@ -132,17 +132,19 @@ export namespace ReactUtils {
132
132
  const ref = refs[k];
133
133
  const item = ref?.current;
134
134
  if (item == null) continue;
135
- const value = data[k];
136
135
 
137
- if (local && local(item, value) !== false) {
136
+ if (local && local(item, data[k]) !== false) {
138
137
  continue;
139
138
  } else if (
140
139
  item instanceof HTMLInputElement ||
141
- item instanceof HTMLTextAreaElement
140
+ item instanceof HTMLTextAreaElement ||
141
+ item instanceof HTMLSelectElement
142
142
  ) {
143
- item.value = `${value ?? ''}`;
143
+ item.value = `${
144
+ Utils.getNestedValue(data, item.name || k) ?? ''
145
+ }`;
144
146
  } else {
145
- (item as any).value = value;
147
+ (item as any).value = data[k];
146
148
  }
147
149
  }
148
150
  }
@@ -153,7 +155,7 @@ export namespace ReactUtils {
153
155
  * @param data Data
154
156
  * @param callback Callback to return new value
155
157
  */
156
- export function updateRefValues<D, T = HTMLInputElement>(
158
+ export function updateRefValues<D extends object, T = HTMLInputElement>(
157
159
  refs: Partial<
158
160
  DataTypes.DI<
159
161
  ReadonlyArray<keyof D & string>,
@@ -179,9 +181,16 @@ export namespace ReactUtils {
179
181
  if (local) {
180
182
  data[k] = local(item);
181
183
  } else if (item instanceof HTMLInputElement) {
182
- data[k] = DomUtils.getInputValue(item) as any;
183
- } else if (item instanceof HTMLTextAreaElement) {
184
- data[k] = item.value as any;
184
+ Utils.setNestedValue(
185
+ data,
186
+ item.name || k,
187
+ DomUtils.getInputValue(item)
188
+ );
189
+ } else if (
190
+ item instanceof HTMLTextAreaElement ||
191
+ item instanceof HTMLSelectElement
192
+ ) {
193
+ Utils.setNestedValue(data, item.name || k, item.value);
185
194
  } else {
186
195
  data[k] = (item as any).value;
187
196
  }