@evlop/commons 1.0.105 → 1.0.106
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAoF,MAAM,OAAO,CAAC;AAIzG,eAAO,MAAM,YAAY;;;;
|
|
1
|
+
{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAoF,MAAM,OAAO,CAAC;AAIzG,eAAO,MAAM,YAAY;;;;mIAsLvB,CAAC;AAGH,eAAO,MAAM,WAAW;;;;mIAAe,CAAC;AACxC,eAAe,YAAY,CAAC"}
|
|
@@ -29,12 +29,9 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
29
29
|
}
|
|
30
30
|
return t;
|
|
31
31
|
};
|
|
32
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
33
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
34
|
-
};
|
|
35
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
33
|
exports.withToolbar = exports.withSettings = void 0;
|
|
37
|
-
const lodash_1 =
|
|
34
|
+
const lodash_1 = __importStar(require("lodash"));
|
|
38
35
|
const react_1 = __importStar(require("react"));
|
|
39
36
|
const contexts_1 = require("../../contexts");
|
|
40
37
|
const hooks_1 = require("../../hooks");
|
|
@@ -42,9 +39,8 @@ const withSettings = ({ name: elementName, valueOptions = [], configurationOptio
|
|
|
42
39
|
const newRef = react_1.useRef();
|
|
43
40
|
const ref = react_1.useMemo(() => forwardedRef || newRef, [newRef, forwardedRef]);
|
|
44
41
|
const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, restrictEdit, action: actionProp, onPress, onClick: onClickProp = onPress } = props;
|
|
45
|
-
const configDataKey = react_1.useMemo(() => configModel, [dataModel, configModel]);
|
|
46
42
|
const isEditing = hooks_1.useEditable();
|
|
47
|
-
const isEditable = !!dataModel || !!
|
|
43
|
+
const isEditable = !!dataModel || !!configModel;
|
|
48
44
|
const editMode = isEditing && isEditable;
|
|
49
45
|
const id = react_1.useMemo(() => lodash_1.default.random(100000000000000), []);
|
|
50
46
|
const { data, updateData } = hooks_1.useComponentData();
|
|
@@ -53,22 +49,20 @@ const withSettings = ({ name: elementName, valueOptions = [], configurationOptio
|
|
|
53
49
|
const values = react_1.useMemo(() => {
|
|
54
50
|
if (!dataModel || !valueOptions)
|
|
55
51
|
return {};
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}, {});
|
|
52
|
+
// merge configuration option from props and configuration option values from model
|
|
53
|
+
const valuePropNames = lodash_1.map(valueOptions, 'name');
|
|
54
|
+
const propsForValue = lodash_1.pick(props, valuePropNames);
|
|
55
|
+
return lodash_1.assign(propsForValue, lodash_1.get(data, dataModel));
|
|
61
56
|
}, [dataModel, props, data]);
|
|
62
57
|
// Extract configs from component data
|
|
63
58
|
const configs = react_1.useMemo(() => {
|
|
64
|
-
if (!
|
|
59
|
+
if (!configModel || !configurationOptions)
|
|
65
60
|
return {};
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}, [configDataKey, props, data]);
|
|
61
|
+
// merge configuration option from props and configuration option values from model
|
|
62
|
+
const configOptionPropNames = lodash_1.map(configurationOptions, 'name');
|
|
63
|
+
const propsForConfigOptions = lodash_1.pick(props, configOptionPropNames);
|
|
64
|
+
return lodash_1.assign(propsForConfigOptions, lodash_1.get(data, configModel));
|
|
65
|
+
}, [configModel, props, data]);
|
|
72
66
|
const action = values.action || actionProp;
|
|
73
67
|
const { focused, onFocus, onBlur } = hooks_1.useFocus();
|
|
74
68
|
const [hovered, setHover] = react_1.useState(false);
|
|
@@ -171,11 +165,11 @@ const withSettings = ({ name: elementName, valueOptions = [], configurationOptio
|
|
|
171
165
|
break;
|
|
172
166
|
case 'elementValueUpdated': {
|
|
173
167
|
const { name: key, value } = data;
|
|
174
|
-
updateData(`${isValue(key) ? dataModel :
|
|
168
|
+
updateData(`${isValue(key) ? dataModel : configModel}.${key}`, value);
|
|
175
169
|
break;
|
|
176
170
|
}
|
|
177
171
|
}
|
|
178
|
-
}, [id, dataModel, onFocus, onBlur,
|
|
172
|
+
}, [id, dataModel, onFocus, onBlur, configModel, updateData]);
|
|
179
173
|
react_1.useEffect(() => {
|
|
180
174
|
if (editMode) {
|
|
181
175
|
window.addEventListener('message', onConfigUpdate);
|
|
@@ -187,7 +181,7 @@ const withSettings = ({ name: elementName, valueOptions = [], configurationOptio
|
|
|
187
181
|
return { stack: [{ id, name: dataModel, ref, values, update: updateData, valueOptions, configurationOptions }, ...toolbarStack], setActiveToolbar };
|
|
188
182
|
}, [id, dataModel, values, toolbarStack, setActiveToolbar, ref, updateData]);
|
|
189
183
|
return (react_1.default.createElement(contexts_1.ToolbarProvider, { value: elementContext },
|
|
190
|
-
react_1.default.createElement(RenderComponent, Object.assign({ "data-id": id, animate: true, change: change, focused: focused, hovered: hovered, isEditing: editMode }, props,
|
|
184
|
+
react_1.default.createElement(RenderComponent, Object.assign({ "data-id": id, animate: true, change: change, focused: focused, hovered: hovered, isEditing: editMode }, props, configs, values, extraProps, { action: forwardActions, ref: ref }))));
|
|
191
185
|
});
|
|
192
186
|
exports.withSettings = withSettings;
|
|
193
187
|
exports.withToolbar = exports.withSettings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"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"}
|