@kaspernj/api-maker 1.0.2014 → 1.0.2015
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/build/utils/default-style.js +1 -6
- package/build/utils/icon.js +11 -3
- package/build/utils/text.js +1 -4
- package/package.json +1 -1
- package/src/utils/default-style.jsx +0 -5
- package/src/utils/icon.jsx +12 -2
- package/src/utils/text.jsx +0 -2
|
@@ -27,9 +27,6 @@ const useMergedStyle = (style, elementType) => {
|
|
|
27
27
|
stylesList.push(styleI);
|
|
28
28
|
}
|
|
29
29
|
} else {
|
|
30
|
-
console.log("Pushing custom style", {
|
|
31
|
-
style
|
|
32
|
-
});
|
|
33
30
|
stylesList.push(style);
|
|
34
31
|
}
|
|
35
32
|
return {
|
|
@@ -58,7 +55,6 @@ const WithDefaultStyle = memo(({
|
|
|
58
55
|
throw new Error(`Unhandled props: ${Object.keys(restProps).join(", ")}`);
|
|
59
56
|
}
|
|
60
57
|
const defaultStyle = useContext(DefaultStyleContext);
|
|
61
|
-
console.log("WithDefaultStyle BEFORE", JSON.stringify(defaultStyle));
|
|
62
58
|
const newDefaultStyle = useMemo(() => {
|
|
63
59
|
for (const key in style) {
|
|
64
60
|
if (!(key in defaultStyle)) {
|
|
@@ -69,10 +65,9 @@ const WithDefaultStyle = memo(({
|
|
|
69
65
|
incorporate(newDefaultStyle, defaultStyle, style);
|
|
70
66
|
return newDefaultStyle;
|
|
71
67
|
}, [defaultStyle, style]);
|
|
72
|
-
console.log("WithDefaultStyle AFTER", JSON.stringify(defaultStyle));
|
|
73
68
|
return /*#__PURE__*/React.createElement(DefaultStyleContext.Provider, {
|
|
74
69
|
value: newDefaultStyle
|
|
75
70
|
}, children);
|
|
76
71
|
});
|
|
77
72
|
export { useDefaultStyle, useMergedStyle, WithDefaultStyle };
|
|
78
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsImNyZWF0ZUNvbnRleHQiLCJ1c2VDb250ZXh0IiwidXNlTWVtbyIsImluY29ycG9yYXRlIiwibWVtbyIsIkRlZmF1bHRTdHlsZUNvbnRleHQiLCJUZXh0IiwidXNlRGVmYXVsdFN0eWxlIiwiZGVmYXVsdFN0eWxlIiwidXNlTWVyZ2VkU3R5bGUiLCJzdHlsZSIsImVsZW1lbnRUeXBlIiwibmV3RGVmYXVsdFN0eWxlIiwic3R5bGVzTGlzdCIsInRleHREZWZhdWx0U3R5bGUiLCJBcnJheSIsImlzQXJyYXkiLCJzdHlsZUkiLCJwdXNoIiwiYWN0dWFsTmV3RGVmYXVsdFN0eWxlIiwiV2l0aERlZmF1bHRTdHlsZSIsImNoaWxkcmVuIiwicmVzdFByb3BzIiwiT2JqZWN0Iiwia2V5cyIsImxlbmd0aCIsIkVycm9yIiwiam9pbiIsImtleSIsImNyZWF0ZUVsZW1lbnQiLCJQcm92aWRlciIsInZhbHVlIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2RlZmF1bHQtc3R5bGUuanN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBSZWFjdCwge2NyZWF0ZUNvbnRleHQsIHVzZUNvbnRleHQsIHVzZU1lbW99IGZyb20gXCJyZWFjdFwiXG5pbXBvcnQge2luY29ycG9yYXRlfSBmcm9tIFwiaW5jb3Jwb3JhdG9yXCJcbmltcG9ydCBtZW1vIGZyb20gXCJzZXQtc3RhdGUtY29tcGFyZS9zcmMvbWVtb1wiXG5cbmNvbnN0IERlZmF1bHRTdHlsZUNvbnRleHQgPSBjcmVhdGVDb250ZXh0KHtcbiAgVGV4dDogW11cbn0pXG5cbmNvbnN0IHVzZURlZmF1bHRTdHlsZSA9ICgpID0+IHtcbiAgY29uc3QgZGVmYXVsdFN0eWxlID0gdXNlQ29udGV4dChEZWZhdWx0U3R5bGVDb250ZXh0KVxuXG4gIHJldHVybiBkZWZhdWx0U3R5bGVcbn1cblxuY29uc3QgdXNlTWVyZ2VkU3R5bGUgPSAoc3R5bGUsIGVsZW1lbnRUeXBlKSA9PiB7XG4gIGNvbnN0IGRlZmF1bHRTdHlsZSA9IHVzZURlZmF1bHRTdHlsZSgpXG5cbiAgY29uc3Qge25ld0RlZmF1bHRTdHlsZSwgc3R5bGVzTGlzdH0gPSB1c2VNZW1vKCgpID0+IHtcbiAgICBjb25zdCB0ZXh0RGVmYXVsdFN0eWxlID0gZGVmYXVsdFN0eWxlW2VsZW1lbnRUeXBlXVxuXG4gICAgaWYgKCFzdHlsZSkge1xuICAgICAgcmV0dXJuIHtuZXdEZWZhdWx0U3R5bGU6IGRlZmF1bHRTdHlsZSwgc3R5bGVzTGlzdDogdGV4dERlZmF1bHRTdHlsZX1cbiAgICB9XG5cbiAgICBjb25zdCBzdHlsZXNMaXN0ID0gdGV4dERlZmF1bHRTdHlsZSA/IFsuLi50ZXh0RGVmYXVsdFN0eWxlXSA6IFtdXG5cbiAgICBpZiAoQXJyYXkuaXNBcnJheShzdHlsZSkpIHtcbiAgICAgIGZvciAoY29uc3Qgc3R5bGVJIG9mIHN0eWxlKSB7XG4gICAgICAgIHN0eWxlc0xpc3QucHVzaChzdHlsZUkpXG4gICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIHN0eWxlc0xpc3QucHVzaChzdHlsZSlcbiAgICB9XG5cbiAgICByZXR1cm4ge25ld0RlZmF1bHRTdHlsZSwgc3R5bGVzTGlzdH1cbiAgfSwgW2RlZmF1bHRTdHlsZVtlbGVtZW50VHlwZV0sIHN0eWxlXSlcblxuICBjb25zdCBhY3R1YWxOZXdEZWZhdWx0U3R5bGUgPSB1c2VNZW1vKCgpID0+IHtcbiAgICBjb25zdCBhY3R1YWxOZXdEZWZhdWx0U3R5bGUgPSB7Li4uZGVmYXVsdFN0eWxlfVxuXG4gICAgYWN0dWFsTmV3RGVmYXVsdFN0eWxlW2VsZW1lbnRUeXBlXSA9IHN0eWxlc0xpc3RcblxuICAgIHJldHVybiBhY3R1YWxOZXdEZWZhdWx0U3R5bGVcbiAgfSwgW2RlZmF1bHRTdHlsZSwgbmV3RGVmYXVsdFN0eWxlXSlcblxuICByZXR1cm4ge25ld0RlZmF1bHRTdHlsZTogYWN0dWFsTmV3RGVmYXVsdFN0eWxlLCBzdHlsZXNMaXN0fVxufVxuXG5jb25zdCBXaXRoRGVmYXVsdFN0eWxlID0gbWVtbygoe2NoaWxkcmVuLCBzdHlsZSwgLi4ucmVzdFByb3BzfSkgPT4ge1xuICBpZiAoT2JqZWN0LmtleXMocmVzdFByb3BzKS5sZW5ndGggPiAwKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKGBVbmhhbmRsZWQgcHJvcHM6ICR7T2JqZWN0LmtleXMocmVzdFByb3BzKS5qb2luKFwiLCBcIil9YClcbiAgfVxuXG4gIGNvbnN0IGRlZmF1bHRTdHlsZSA9IHVzZUNvbnRleHQoRGVmYXVsdFN0eWxlQ29udGV4dClcblxuICBjb25zdCBuZXdEZWZhdWx0U3R5bGUgPSB1c2VNZW1vKCgpID0+IHtcbiAgICBmb3IgKGNvbnN0IGtleSBpbiBzdHlsZSkge1xuICAgICAgaWYgKCEoa2V5IGluIGRlZmF1bHRTdHlsZSkpIHtcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBJbnZhbGlkIGVsZW1lbnQgdHlwZSBnaXZlbjogJHtrZXl9YClcbiAgICAgIH1cbiAgICB9XG5cbiAgICBjb25zdCBuZXdEZWZhdWx0U3R5bGUgPSB7fVxuXG4gICAgaW5jb3Jwb3JhdGUobmV3RGVmYXVsdFN0eWxlLCBkZWZhdWx0U3R5bGUsIHN0eWxlKVxuXG4gICAgcmV0dXJuIG5ld0RlZmF1bHRTdHlsZVxuICB9LCBbZGVmYXVsdFN0eWxlLCBzdHlsZV0pXG5cbiAgcmV0dXJuIChcbiAgICA8RGVmYXVsdFN0eWxlQ29udGV4dC5Qcm92aWRlciB2YWx1ZT17bmV3RGVmYXVsdFN0eWxlfT5cbiAgICAgIHtjaGlsZHJlbn1cbiAgICA8L0RlZmF1bHRTdHlsZUNvbnRleHQuUHJvdmlkZXI+XG4gIClcbn0pXG5cbmV4cG9ydCB7dXNlRGVmYXVsdFN0eWxlLCB1c2VNZXJnZWRTdHlsZSwgV2l0aERlZmF1bHRTdHlsZX1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsT0FBT0EsS0FBSyxJQUFHQyxhQUFhLEVBQUVDLFVBQVUsRUFBRUMsT0FBTyxRQUFPLE9BQU87QUFDL0QsU0FBUUMsV0FBVyxRQUFPLGNBQWM7QUFDeEMsT0FBT0MsSUFBSSxNQUFNLDRCQUE0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
|
package/build/utils/icon.js
CHANGED
|
@@ -19,8 +19,16 @@ export default memo(shapeComponent(class ApiMakerUtilsIcon extends BaseComponent
|
|
|
19
19
|
const actualStylesList = useMemo(() => {
|
|
20
20
|
const actualStylesList = [];
|
|
21
21
|
for (const style of stylesList) {
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
const newStyle = {};
|
|
23
|
+
let count = 0;
|
|
24
|
+
for (const key in style) {
|
|
25
|
+
if (key == "color") {
|
|
26
|
+
newStyle[key] = style[key];
|
|
27
|
+
count++;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
if (count > 0) {
|
|
31
|
+
actualStylesList.push(newStyle);
|
|
24
32
|
}
|
|
25
33
|
}
|
|
26
34
|
return actualStylesList;
|
|
@@ -30,4 +38,4 @@ export default memo(shapeComponent(class ApiMakerUtilsIcon extends BaseComponent
|
|
|
30
38
|
}, restProps));
|
|
31
39
|
}
|
|
32
40
|
}));
|
|
33
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJCYXNlQ29tcG9uZW50IiwiRm9udEF3ZXNvbWVJY29uIiwibWVtbyIsIlJlYWN0IiwidXNlTWVtbyIsInNoYXBlQ29tcG9uZW50IiwidXNlTWVyZ2VkU3R5bGUiLCJBcGlNYWtlclV0aWxzSWNvbiIsInJlbmRlciIsInN0eWxlIiwicmVzdFByb3BzIiwicHJvcHMiLCJzdHlsZXNMaXN0IiwiYWN0dWFsU3R5bGVzTGlzdCIsIm5ld1N0eWxlIiwiY291bnQiLCJrZXkiLCJwdXNoIiwiY3JlYXRlRWxlbWVudCIsIl9leHRlbmRzIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2ljb24uanN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBCYXNlQ29tcG9uZW50IGZyb20gXCIuLi9iYXNlLWNvbXBvbmVudFwiXG5pbXBvcnQgRm9udEF3ZXNvbWVJY29uIGZyb20gXCJyZWFjdC1uYXRpdmUtdmVjdG9yLWljb25zL0ZvbnRBd2Vzb21lXCJcbmltcG9ydCBtZW1vIGZyb20gXCJzZXQtc3RhdGUtY29tcGFyZS9zcmMvbWVtb1wiXG5pbXBvcnQgUmVhY3QsIHt1c2VNZW1vfSBmcm9tIFwicmVhY3RcIlxuaW1wb3J0IHtzaGFwZUNvbXBvbmVudH0gZnJvbSBcInNldC1zdGF0ZS1jb21wYXJlL3NyYy9zaGFwZS1jb21wb25lbnRcIlxuaW1wb3J0IHt1c2VNZXJnZWRTdHlsZX0gZnJvbSBcIi4vZGVmYXVsdC1zdHlsZVwiXG5cbmV4cG9ydCBkZWZhdWx0IG1lbW8oc2hhcGVDb21wb25lbnQoY2xhc3MgQXBpTWFrZXJVdGlsc0ljb24gZXh0ZW5kcyBCYXNlQ29tcG9uZW50IHtcbiAgcmVuZGVyKCkge1xuICAgIGNvbnN0IHtzdHlsZSwgLi4ucmVzdFByb3BzfSA9IHRoaXMucHJvcHNcbiAgICBjb25zdCB7c3R5bGVzTGlzdH0gPSB1c2VNZXJnZWRTdHlsZShzdHlsZSwgXCJUZXh0XCIpXG5cbiAgICAvLyBPbmx5IGZvcndhcmQgc29tZSBzdHlsZXMgbGlrZSBjb2xvclxuICAgIGNvbnN0IGFjdHVhbFN0eWxlc0xpc3QgPSB1c2VNZW1vKCgpID0+IHtcbiAgICAgIGNvbnN0IGFjdHVhbFN0eWxlc0xpc3QgPSBbXVxuXG4gICAgICBmb3IgKGNvbnN0IHN0eWxlIG9mIHN0eWxlc0xpc3QpIHtcbiAgICAgICAgY29uc3QgbmV3U3R5bGUgPSB7fVxuICAgICAgICBsZXQgY291bnQgPSAwXG5cbiAgICAgICAgZm9yIChjb25zdCBrZXkgaW4gc3R5bGUpIHtcbiAgICAgICAgICBpZiAoa2V5ID09IFwiY29sb3JcIikge1xuICAgICAgICAgICAgbmV3U3R5bGVba2V5XSA9IHN0eWxlW2tleV1cbiAgICAgICAgICAgIGNvdW50KytcbiAgICAgICAgICB9XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoY291bnQgPiAwKSB7XG4gICAgICAgICAgYWN0dWFsU3R5bGVzTGlzdC5wdXNoKG5ld1N0eWxlKVxuICAgICAgICB9XG4gICAgICB9XG5cbiAgICAgIHJldHVybiBhY3R1YWxTdHlsZXNMaXN0XG4gICAgfSwgW3N0eWxlc0xpc3QsIHN0eWxlXSlcblxuICAgIHJldHVybiAoXG4gICAgICA8Rm9udEF3ZXNvbWVJY29uIHN0eWxlPXthY3R1YWxTdHlsZXNMaXN0fSB7Li4ucmVzdFByb3BzfSAvPlxuICAgIClcbiAgfVxufSkpXG4iXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPQSxhQUFhLE1BQU0sbUJBQW1CO0FBQzdDLE9BQU9DLGVBQWUsTUFBTSx1Q0FBdUM7QUFDbkUsT0FBT0MsSUFBSSxNQUFNLDRCQUE0QjtBQUM3QyxPQUFPQyxLQUFLLElBQUdDLE9BQU8sUUFBTyxPQUFPO0FBQ3BDLFNBQVFDLGNBQWMsUUFBTyx1Q0FBdUM7QUFDcEUsU0FBUUMsY0FBYyxRQUFPLGlCQUFpQjtBQUU5QyxlQUFlSixJQUFJLENBQUNHLGNBQWMsQ0FBQyxNQUFNRSxpQkFBaUIsU0FBU1AsYUFBYSxDQUFDO0VBQy9FUSxNQUFNQSxDQUFBLEVBQUc7SUFDUCxNQUFNO01BQUNDLEtBQUs7TUFBRSxHQUFHQztJQUFTLENBQUMsR0FBRyxJQUFJLENBQUNDLEtBQUs7SUFDeEMsTUFBTTtNQUFDQztJQUFVLENBQUMsR0FBR04sY0FBYyxDQUFDRyxLQUFLLEVBQUUsTUFBTSxDQUFDOztJQUVsRDtJQUNBLE1BQU1JLGdCQUFnQixHQUFHVCxPQUFPLENBQUMsTUFBTTtNQUNyQyxNQUFNUyxnQkFBZ0IsR0FBRyxFQUFFO01BRTNCLEtBQUssTUFBTUosS0FBSyxJQUFJRyxVQUFVLEVBQUU7UUFDOUIsTUFBTUUsUUFBUSxHQUFHLENBQUMsQ0FBQztRQUNuQixJQUFJQyxLQUFLLEdBQUcsQ0FBQztRQUViLEtBQUssTUFBTUMsR0FBRyxJQUFJUCxLQUFLLEVBQUU7VUFDdkIsSUFBSU8sR0FBRyxJQUFJLE9BQU8sRUFBRTtZQUNsQkYsUUFBUSxDQUFDRSxHQUFHLENBQUMsR0FBR1AsS0FBSyxDQUFDTyxHQUFHLENBQUM7WUFDMUJELEtBQUssRUFBRTtVQUNUO1FBQ0Y7UUFFQSxJQUFJQSxLQUFLLEdBQUcsQ0FBQyxFQUFFO1VBQ2JGLGdCQUFnQixDQUFDSSxJQUFJLENBQUNILFFBQVEsQ0FBQztRQUNqQztNQUNGO01BRUEsT0FBT0QsZ0JBQWdCO0lBQ3pCLENBQUMsRUFBRSxDQUFDRCxVQUFVLEVBQUVILEtBQUssQ0FBQyxDQUFDO0lBRXZCLG9CQUNFTixLQUFBLENBQUFlLGFBQUEsQ0FBQ2pCLGVBQWUsRUFBQWtCLFFBQUE7TUFBQ1YsS0FBSyxFQUFFSTtJQUFpQixHQUFLSCxTQUFTLENBQUcsQ0FBQztFQUUvRDtBQUNGLENBQUMsQ0FBQyxDQUFDIiwiaWdub3JlTGlzdCI6W119
|
package/build/utils/text.js
CHANGED
|
@@ -12,13 +12,10 @@ export default memo(props => {
|
|
|
12
12
|
newDefaultStyle,
|
|
13
13
|
stylesList
|
|
14
14
|
} = useMergedStyle(style, "Text");
|
|
15
|
-
console.log("ApiMaker Text", {
|
|
16
|
-
stylesList
|
|
17
|
-
});
|
|
18
15
|
return /*#__PURE__*/React.createElement(WithDefaultStyle, {
|
|
19
16
|
style: newDefaultStyle
|
|
20
17
|
}, /*#__PURE__*/React.createElement(Text, _extends({
|
|
21
18
|
style: stylesList
|
|
22
19
|
}, restProps)));
|
|
23
20
|
});
|
|
24
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJtZW1vIiwiUmVhY3QiLCJUZXh0IiwidXNlTWVyZ2VkU3R5bGUiLCJXaXRoRGVmYXVsdFN0eWxlIiwicHJvcHMiLCJzdHlsZSIsInJlc3RQcm9wcyIsIm5ld0RlZmF1bHRTdHlsZSIsInN0eWxlc0xpc3QiLCJjcmVhdGVFbGVtZW50IiwiX2V4dGVuZHMiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdGV4dC5qc3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IG1lbW8gZnJvbSBcInNldC1zdGF0ZS1jb21wYXJlL3NyYy9tZW1vXCJcbmltcG9ydCBSZWFjdCBmcm9tIFwicmVhY3RcIlxuaW1wb3J0IHtUZXh0fSBmcm9tIFwicmVhY3QtbmF0aXZlXCJcbmltcG9ydCB7dXNlTWVyZ2VkU3R5bGUsIFdpdGhEZWZhdWx0U3R5bGV9IGZyb20gXCIuL2RlZmF1bHQtc3R5bGVcIlxuXG5leHBvcnQgZGVmYXVsdCBtZW1vKChwcm9wcykgPT4ge1xuICBjb25zdCB7c3R5bGUsIC4uLnJlc3RQcm9wc30gPSBwcm9wc1xuICBjb25zdCB7bmV3RGVmYXVsdFN0eWxlLCBzdHlsZXNMaXN0fSA9IHVzZU1lcmdlZFN0eWxlKHN0eWxlLCBcIlRleHRcIilcblxuICByZXR1cm4gKFxuICAgIDxXaXRoRGVmYXVsdFN0eWxlIHN0eWxlPXtuZXdEZWZhdWx0U3R5bGV9PlxuICAgICAgPFRleHQgc3R5bGU9e3N0eWxlc0xpc3R9IHsuLi5yZXN0UHJvcHN9IC8+XG4gICAgPC9XaXRoRGVmYXVsdFN0eWxlPlxuICApXG59KVxuIl0sIm1hcHBpbmdzIjoiO0FBQUEsT0FBT0EsSUFBSSxNQUFNLDRCQUE0QjtBQUM3QyxPQUFPQyxLQUFLLE1BQU0sT0FBTztBQUN6QixTQUFRQyxJQUFJLFFBQU8sY0FBYztBQUNqQyxTQUFRQyxjQUFjLEVBQUVDLGdCQUFnQixRQUFPLGlCQUFpQjtBQUVoRSxlQUFlSixJQUFJLENBQUVLLEtBQUssSUFBSztFQUM3QixNQUFNO0lBQUNDLEtBQUs7SUFBRSxHQUFHQztFQUFTLENBQUMsR0FBR0YsS0FBSztFQUNuQyxNQUFNO0lBQUNHLGVBQWU7SUFBRUM7RUFBVSxDQUFDLEdBQUdOLGNBQWMsQ0FBQ0csS0FBSyxFQUFFLE1BQU0sQ0FBQztFQUVuRSxvQkFDRUwsS0FBQSxDQUFBUyxhQUFBLENBQUNOLGdCQUFnQjtJQUFDRSxLQUFLLEVBQUVFO0VBQWdCLGdCQUN2Q1AsS0FBQSxDQUFBUyxhQUFBLENBQUNSLElBQUksRUFBQVMsUUFBQTtJQUFDTCxLQUFLLEVBQUVHO0VBQVcsR0FBS0YsU0FBUyxDQUFHLENBQ3pCLENBQUM7QUFFdkIsQ0FBQyxDQUFDIiwiaWdub3JlTGlzdCI6W119
|
package/package.json
CHANGED
|
@@ -29,7 +29,6 @@ const useMergedStyle = (style, elementType) => {
|
|
|
29
29
|
stylesList.push(styleI)
|
|
30
30
|
}
|
|
31
31
|
} else {
|
|
32
|
-
console.log("Pushing custom style", {style})
|
|
33
32
|
stylesList.push(style)
|
|
34
33
|
}
|
|
35
34
|
|
|
@@ -54,8 +53,6 @@ const WithDefaultStyle = memo(({children, style, ...restProps}) => {
|
|
|
54
53
|
|
|
55
54
|
const defaultStyle = useContext(DefaultStyleContext)
|
|
56
55
|
|
|
57
|
-
console.log("WithDefaultStyle BEFORE", JSON.stringify(defaultStyle))
|
|
58
|
-
|
|
59
56
|
const newDefaultStyle = useMemo(() => {
|
|
60
57
|
for (const key in style) {
|
|
61
58
|
if (!(key in defaultStyle)) {
|
|
@@ -70,8 +67,6 @@ const WithDefaultStyle = memo(({children, style, ...restProps}) => {
|
|
|
70
67
|
return newDefaultStyle
|
|
71
68
|
}, [defaultStyle, style])
|
|
72
69
|
|
|
73
|
-
console.log("WithDefaultStyle AFTER", JSON.stringify(defaultStyle))
|
|
74
|
-
|
|
75
70
|
return (
|
|
76
71
|
<DefaultStyleContext.Provider value={newDefaultStyle}>
|
|
77
72
|
{children}
|
package/src/utils/icon.jsx
CHANGED
|
@@ -15,8 +15,18 @@ export default memo(shapeComponent(class ApiMakerUtilsIcon extends BaseComponent
|
|
|
15
15
|
const actualStylesList = []
|
|
16
16
|
|
|
17
17
|
for (const style of stylesList) {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
const newStyle = {}
|
|
19
|
+
let count = 0
|
|
20
|
+
|
|
21
|
+
for (const key in style) {
|
|
22
|
+
if (key == "color") {
|
|
23
|
+
newStyle[key] = style[key]
|
|
24
|
+
count++
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
if (count > 0) {
|
|
29
|
+
actualStylesList.push(newStyle)
|
|
20
30
|
}
|
|
21
31
|
}
|
|
22
32
|
|
package/src/utils/text.jsx
CHANGED
|
@@ -7,8 +7,6 @@ export default memo((props) => {
|
|
|
7
7
|
const {style, ...restProps} = props
|
|
8
8
|
const {newDefaultStyle, stylesList} = useMergedStyle(style, "Text")
|
|
9
9
|
|
|
10
|
-
console.log("ApiMaker Text", {stylesList})
|
|
11
|
-
|
|
12
10
|
return (
|
|
13
11
|
<WithDefaultStyle style={newDefaultStyle}>
|
|
14
12
|
<Text style={stylesList} {...restProps} />
|