@kaspernj/api-maker 1.0.2013 → 1.0.2014
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 +67 -7
- package/build/utils/icon.js +18 -8
- package/build/utils/text.js +9 -29
- package/package.json +2 -2
- package/src/utils/default-style.jsx +63 -6
- package/src/utils/icon.jsx +17 -8
- package/src/utils/text.jsx +5 -26
|
@@ -1,18 +1,78 @@
|
|
|
1
|
-
import React, { createContext, useContext } from "react";
|
|
1
|
+
import React, { createContext, useContext, useMemo } from "react";
|
|
2
|
+
import { incorporate } from "incorporator";
|
|
2
3
|
import memo from "set-state-compare/src/memo";
|
|
3
4
|
const DefaultStyleContext = /*#__PURE__*/createContext({
|
|
4
|
-
Text:
|
|
5
|
+
Text: []
|
|
5
6
|
});
|
|
6
7
|
const useDefaultStyle = () => {
|
|
7
8
|
const defaultStyle = useContext(DefaultStyleContext);
|
|
8
9
|
return defaultStyle;
|
|
9
10
|
};
|
|
10
|
-
const
|
|
11
|
+
const useMergedStyle = (style, elementType) => {
|
|
12
|
+
const defaultStyle = useDefaultStyle();
|
|
13
|
+
const {
|
|
14
|
+
newDefaultStyle,
|
|
15
|
+
stylesList
|
|
16
|
+
} = useMemo(() => {
|
|
17
|
+
const textDefaultStyle = defaultStyle[elementType];
|
|
18
|
+
if (!style) {
|
|
19
|
+
return {
|
|
20
|
+
newDefaultStyle: defaultStyle,
|
|
21
|
+
stylesList: textDefaultStyle
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
const stylesList = textDefaultStyle ? [...textDefaultStyle] : [];
|
|
25
|
+
if (Array.isArray(style)) {
|
|
26
|
+
for (const styleI of style) {
|
|
27
|
+
stylesList.push(styleI);
|
|
28
|
+
}
|
|
29
|
+
} else {
|
|
30
|
+
console.log("Pushing custom style", {
|
|
31
|
+
style
|
|
32
|
+
});
|
|
33
|
+
stylesList.push(style);
|
|
34
|
+
}
|
|
35
|
+
return {
|
|
36
|
+
newDefaultStyle,
|
|
37
|
+
stylesList
|
|
38
|
+
};
|
|
39
|
+
}, [defaultStyle[elementType], style]);
|
|
40
|
+
const actualNewDefaultStyle = useMemo(() => {
|
|
41
|
+
const actualNewDefaultStyle = {
|
|
42
|
+
...defaultStyle
|
|
43
|
+
};
|
|
44
|
+
actualNewDefaultStyle[elementType] = stylesList;
|
|
45
|
+
return actualNewDefaultStyle;
|
|
46
|
+
}, [defaultStyle, newDefaultStyle]);
|
|
47
|
+
return {
|
|
48
|
+
newDefaultStyle: actualNewDefaultStyle,
|
|
49
|
+
stylesList
|
|
50
|
+
};
|
|
51
|
+
};
|
|
52
|
+
const WithDefaultStyle = memo(({
|
|
53
|
+
children,
|
|
54
|
+
style,
|
|
55
|
+
...restProps
|
|
56
|
+
}) => {
|
|
57
|
+
if (Object.keys(restProps).length > 0) {
|
|
58
|
+
throw new Error(`Unhandled props: ${Object.keys(restProps).join(", ")}`);
|
|
59
|
+
}
|
|
11
60
|
const defaultStyle = useContext(DefaultStyleContext);
|
|
12
|
-
|
|
61
|
+
console.log("WithDefaultStyle BEFORE", JSON.stringify(defaultStyle));
|
|
62
|
+
const newDefaultStyle = useMemo(() => {
|
|
63
|
+
for (const key in style) {
|
|
64
|
+
if (!(key in defaultStyle)) {
|
|
65
|
+
throw new Error(`Invalid element type given: ${key}`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
const newDefaultStyle = {};
|
|
69
|
+
incorporate(newDefaultStyle, defaultStyle, style);
|
|
70
|
+
return newDefaultStyle;
|
|
71
|
+
}, [defaultStyle, style]);
|
|
72
|
+
console.log("WithDefaultStyle AFTER", JSON.stringify(defaultStyle));
|
|
13
73
|
return /*#__PURE__*/React.createElement(DefaultStyleContext.Provider, {
|
|
14
74
|
value: newDefaultStyle
|
|
15
|
-
},
|
|
75
|
+
}, children);
|
|
16
76
|
});
|
|
17
|
-
export { useDefaultStyle, WithDefaultStyle };
|
|
18
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
77
|
+
export { useDefaultStyle, useMergedStyle, WithDefaultStyle };
|
|
78
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsImNyZWF0ZUNvbnRleHQiLCJ1c2VDb250ZXh0IiwidXNlTWVtbyIsImluY29ycG9yYXRlIiwibWVtbyIsIkRlZmF1bHRTdHlsZUNvbnRleHQiLCJUZXh0IiwidXNlRGVmYXVsdFN0eWxlIiwiZGVmYXVsdFN0eWxlIiwidXNlTWVyZ2VkU3R5bGUiLCJzdHlsZSIsImVsZW1lbnRUeXBlIiwibmV3RGVmYXVsdFN0eWxlIiwic3R5bGVzTGlzdCIsInRleHREZWZhdWx0U3R5bGUiLCJBcnJheSIsImlzQXJyYXkiLCJzdHlsZUkiLCJwdXNoIiwiY29uc29sZSIsImxvZyIsImFjdHVhbE5ld0RlZmF1bHRTdHlsZSIsIldpdGhEZWZhdWx0U3R5bGUiLCJjaGlsZHJlbiIsInJlc3RQcm9wcyIsIk9iamVjdCIsImtleXMiLCJsZW5ndGgiLCJFcnJvciIsImpvaW4iLCJKU09OIiwic3RyaW5naWZ5Iiwia2V5IiwiY3JlYXRlRWxlbWVudCIsIlByb3ZpZGVyIiwidmFsdWUiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZGVmYXVsdC1zdHlsZS5qc3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFJlYWN0LCB7Y3JlYXRlQ29udGV4dCwgdXNlQ29udGV4dCwgdXNlTWVtb30gZnJvbSBcInJlYWN0XCJcbmltcG9ydCB7aW5jb3Jwb3JhdGV9IGZyb20gXCJpbmNvcnBvcmF0b3JcIlxuaW1wb3J0IG1lbW8gZnJvbSBcInNldC1zdGF0ZS1jb21wYXJlL3NyYy9tZW1vXCJcblxuY29uc3QgRGVmYXVsdFN0eWxlQ29udGV4dCA9IGNyZWF0ZUNvbnRleHQoe1xuICBUZXh0OiBbXVxufSlcblxuY29uc3QgdXNlRGVmYXVsdFN0eWxlID0gKCkgPT4ge1xuICBjb25zdCBkZWZhdWx0U3R5bGUgPSB1c2VDb250ZXh0KERlZmF1bHRTdHlsZUNvbnRleHQpXG5cbiAgcmV0dXJuIGRlZmF1bHRTdHlsZVxufVxuXG5jb25zdCB1c2VNZXJnZWRTdHlsZSA9IChzdHlsZSwgZWxlbWVudFR5cGUpID0+IHtcbiAgY29uc3QgZGVmYXVsdFN0eWxlID0gdXNlRGVmYXVsdFN0eWxlKClcblxuICBjb25zdCB7bmV3RGVmYXVsdFN0eWxlLCBzdHlsZXNMaXN0fSA9IHVzZU1lbW8oKCkgPT4ge1xuICAgIGNvbnN0IHRleHREZWZhdWx0U3R5bGUgPSBkZWZhdWx0U3R5bGVbZWxlbWVudFR5cGVdXG5cbiAgICBpZiAoIXN0eWxlKSB7XG4gICAgICByZXR1cm4ge25ld0RlZmF1bHRTdHlsZTogZGVmYXVsdFN0eWxlLCBzdHlsZXNMaXN0OiB0ZXh0RGVmYXVsdFN0eWxlfVxuICAgIH1cblxuICAgIGNvbnN0IHN0eWxlc0xpc3QgPSB0ZXh0RGVmYXVsdFN0eWxlID8gWy4uLnRleHREZWZhdWx0U3R5bGVdIDogW11cblxuICAgIGlmIChBcnJheS5pc0FycmF5KHN0eWxlKSkge1xuICAgICAgZm9yIChjb25zdCBzdHlsZUkgb2Ygc3R5bGUpIHtcbiAgICAgICAgc3R5bGVzTGlzdC5wdXNoKHN0eWxlSSlcbiAgICAgIH1cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc29sZS5sb2coXCJQdXNoaW5nIGN1c3RvbSBzdHlsZVwiLCB7c3R5bGV9KVxuICAgICAgc3R5bGVzTGlzdC5wdXNoKHN0eWxlKVxuICAgIH1cblxuICAgIHJldHVybiB7bmV3RGVmYXVsdFN0eWxlLCBzdHlsZXNMaXN0fVxuICB9LCBbZGVmYXVsdFN0eWxlW2VsZW1lbnRUeXBlXSwgc3R5bGVdKVxuXG4gIGNvbnN0IGFjdHVhbE5ld0RlZmF1bHRTdHlsZSA9IHVzZU1lbW8oKCkgPT4ge1xuICAgIGNvbnN0IGFjdHVhbE5ld0RlZmF1bHRTdHlsZSA9IHsuLi5kZWZhdWx0U3R5bGV9XG5cbiAgICBhY3R1YWxOZXdEZWZhdWx0U3R5bGVbZWxlbWVudFR5cGVdID0gc3R5bGVzTGlzdFxuXG4gICAgcmV0dXJuIGFjdHVhbE5ld0RlZmF1bHRTdHlsZVxuICB9LCBbZGVmYXVsdFN0eWxlLCBuZXdEZWZhdWx0U3R5bGVdKVxuXG4gIHJldHVybiB7bmV3RGVmYXVsdFN0eWxlOiBhY3R1YWxOZXdEZWZhdWx0U3R5bGUsIHN0eWxlc0xpc3R9XG59XG5cbmNvbnN0IFdpdGhEZWZhdWx0U3R5bGUgPSBtZW1vKCh7Y2hpbGRyZW4sIHN0eWxlLCAuLi5yZXN0UHJvcHN9KSA9PiB7XG4gIGlmIChPYmplY3Qua2V5cyhyZXN0UHJvcHMpLmxlbmd0aCA+IDApIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoYFVuaGFuZGxlZCBwcm9wczogJHtPYmplY3Qua2V5cyhyZXN0UHJvcHMpLmpvaW4oXCIsIFwiKX1gKVxuICB9XG5cbiAgY29uc3QgZGVmYXVsdFN0eWxlID0gdXNlQ29udGV4dChEZWZhdWx0U3R5bGVDb250ZXh0KVxuXG4gIGNvbnNvbGUubG9nKFwiV2l0aERlZmF1bHRTdHlsZSBCRUZPUkVcIiwgSlNPTi5zdHJpbmdpZnkoZGVmYXVsdFN0eWxlKSlcblxuICBjb25zdCBuZXdEZWZhdWx0U3R5bGUgPSB1c2VNZW1vKCgpID0+IHtcbiAgICBmb3IgKGNvbnN0IGtleSBpbiBzdHlsZSkge1xuICAgICAgaWYgKCEoa2V5IGluIGRlZmF1bHRTdHlsZSkpIHtcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBJbnZhbGlkIGVsZW1lbnQgdHlwZSBnaXZlbjogJHtrZXl9YClcbiAgICAgIH1cbiAgICB9XG5cbiAgICBjb25zdCBuZXdEZWZhdWx0U3R5bGUgPSB7fVxuXG4gICAgaW5jb3Jwb3JhdGUobmV3RGVmYXVsdFN0eWxlLCBkZWZhdWx0U3R5bGUsIHN0eWxlKVxuXG4gICAgcmV0dXJuIG5ld0RlZmF1bHRTdHlsZVxuICB9LCBbZGVmYXVsdFN0eWxlLCBzdHlsZV0pXG5cbiAgY29uc29sZS5sb2coXCJXaXRoRGVmYXVsdFN0eWxlIEFGVEVSXCIsIEpTT04uc3RyaW5naWZ5KGRlZmF1bHRTdHlsZSkpXG5cbiAgcmV0dXJuIChcbiAgICA8RGVmYXVsdFN0eWxlQ29udGV4dC5Qcm92aWRlciB2YWx1ZT17bmV3RGVmYXVsdFN0eWxlfT5cbiAgICAgIHtjaGlsZHJlbn1cbiAgICA8L0RlZmF1bHRTdHlsZUNvbnRleHQuUHJvdmlkZXI+XG4gIClcbn0pXG5cbmV4cG9ydCB7dXNlRGVmYXVsdFN0eWxlLCB1c2VNZXJnZWRTdHlsZSwgV2l0aERlZmF1bHRTdHlsZX1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsT0FBT0EsS0FBSyxJQUFHQyxhQUFhLEVBQUVDLFVBQVUsRUFBRUMsT0FBTyxRQUFPLE9BQU87QUFDL0QsU0FBUUMsV0FBVyxRQUFPLGNBQWM7QUFDeEMsT0FBT0MsSUFBSSxNQUFNLDRCQUE0QjtBQUU3QyxNQUFNQyxtQkFBbUIsZ0JBQUdMLGFBQWEsQ0FBQztFQUN4Q00sSUFBSSxFQUFFO0FBQ1IsQ0FBQyxDQUFDO0FBRUYsTUFBTUMsZUFBZSxHQUFHQSxDQUFBLEtBQU07RUFDNUIsTUFBTUMsWUFBWSxHQUFHUCxVQUFVLENBQUNJLG1CQUFtQixDQUFDO0VBRXBELE9BQU9HLFlBQVk7QUFDckIsQ0FBQztBQUVELE1BQU1DLGNBQWMsR0FBR0EsQ0FBQ0MsS0FBSyxFQUFFQyxXQUFXLEtBQUs7RUFDN0MsTUFBTUgsWUFBWSxHQUFHRCxlQUFlLENBQUMsQ0FBQztFQUV0QyxNQUFNO0lBQUNLLGVBQWU7SUFBRUM7RUFBVSxDQUFDLEdBQUdYLE9BQU8sQ0FBQyxNQUFNO0lBQ2xELE1BQU1ZLGdCQUFnQixHQUFHTixZQUFZLENBQUNHLFdBQVcsQ0FBQztJQUVsRCxJQUFJLENBQUNELEtBQUssRUFBRTtNQUNWLE9BQU87UUFBQ0UsZUFBZSxFQUFFSixZQUFZO1FBQUVLLFVBQVUsRUFBRUM7TUFBZ0IsQ0FBQztJQUN0RTtJQUVBLE1BQU1ELFVBQVUsR0FBR0MsZ0JBQWdCLEdBQUcsQ0FBQyxHQUFHQSxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUU7SUFFaEUsSUFBSUMsS0FBSyxDQUFDQyxPQUFPLENBQUNOLEtBQUssQ0FBQyxFQUFFO01BQ3hCLEtBQUssTUFBTU8sTUFBTSxJQUFJUCxLQUFLLEVBQUU7UUFDMUJHLFVBQVUsQ0FBQ0ssSUFBSSxDQUFDRCxNQUFNLENBQUM7TUFDekI7SUFDRixDQUFDLE1BQU07TUFDTEUsT0FBTyxDQUFDQyxHQUFHLENBQUMsc0JBQXNCLEVBQUU7UUFBQ1Y7TUFBSyxDQUFDLENBQUM7TUFDNUNHLFVBQVUsQ0FBQ0ssSUFBSSxDQUFDUixLQUFLLENBQUM7SUFDeEI7SUFFQSxPQUFPO01BQUNFLGVBQWU7TUFBRUM7SUFBVSxDQUFDO0VBQ3RDLENBQUMsRUFBRSxDQUFDTCxZQUFZLENBQUNHLFdBQVcsQ0FBQyxFQUFFRCxLQUFLLENBQUMsQ0FBQztFQUV0QyxNQUFNVyxxQkFBcUIsR0FBR25CLE9BQU8sQ0FBQyxNQUFNO0lBQzFDLE1BQU1tQixxQkFBcUIsR0FBRztNQUFDLEdBQUdiO0lBQVksQ0FBQztJQUUvQ2EscUJBQXFCLENBQUNWLFdBQVcsQ0FBQyxHQUFHRSxVQUFVO0lBRS9DLE9BQU9RLHFCQUFxQjtFQUM5QixDQUFDLEVBQUUsQ0FBQ2IsWUFBWSxFQUFFSSxlQUFlLENBQUMsQ0FBQztFQUVuQyxPQUFPO0lBQUNBLGVBQWUsRUFBRVMscUJBQXFCO0lBQUVSO0VBQVUsQ0FBQztBQUM3RCxDQUFDO0FBRUQsTUFBTVMsZ0JBQWdCLEdBQUdsQixJQUFJLENBQUMsQ0FBQztFQUFDbUIsUUFBUTtFQUFFYixLQUFLO0VBQUUsR0FBR2M7QUFBUyxDQUFDLEtBQUs7RUFDakUsSUFBSUMsTUFBTSxDQUFDQyxJQUFJLENBQUNGLFNBQVMsQ0FBQyxDQUFDRyxNQUFNLEdBQUcsQ0FBQyxFQUFFO0lBQ3JDLE1BQU0sSUFBSUMsS0FBSyxDQUFDLG9CQUFvQkgsTUFBTSxDQUFDQyxJQUFJLENBQUNGLFNBQVMsQ0FBQyxDQUFDSyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztFQUMxRTtFQUVBLE1BQU1yQixZQUFZLEdBQUdQLFVBQVUsQ0FBQ0ksbUJBQW1CLENBQUM7RUFFcERjLE9BQU8sQ0FBQ0MsR0FBRyxDQUFDLHlCQUF5QixFQUFFVSxJQUFJLENBQUNDLFNBQVMsQ0FBQ3ZCLFlBQVksQ0FBQyxDQUFDO0VBRXBFLE1BQU1JLGVBQWUsR0FBR1YsT0FBTyxDQUFDLE1BQU07SUFDcEMsS0FBSyxNQUFNOEIsR0FBRyxJQUFJdEIsS0FBSyxFQUFFO01BQ3ZCLElBQUksRUFBRXNCLEdBQUcsSUFBSXhCLFlBQVksQ0FBQyxFQUFFO1FBQzFCLE1BQU0sSUFBSW9CLEtBQUssQ0FBQywrQkFBK0JJLEdBQUcsRUFBRSxDQUFDO01BQ3ZEO0lBQ0Y7SUFFQSxNQUFNcEIsZUFBZSxHQUFHLENBQUMsQ0FBQztJQUUxQlQsV0FBVyxDQUFDUyxlQUFlLEVBQUVKLFlBQVksRUFBRUUsS0FBSyxDQUFDO0lBRWpELE9BQU9FLGVBQWU7RUFDeEIsQ0FBQyxFQUFFLENBQUNKLFlBQVksRUFBRUUsS0FBSyxDQUFDLENBQUM7RUFFekJTLE9BQU8sQ0FBQ0MsR0FBRyxDQUFDLHdCQUF3QixFQUFFVSxJQUFJLENBQUNDLFNBQVMsQ0FBQ3ZCLFlBQVksQ0FBQyxDQUFDO0VBRW5FLG9CQUNFVCxLQUFBLENBQUFrQyxhQUFBLENBQUM1QixtQkFBbUIsQ0FBQzZCLFFBQVE7SUFBQ0MsS0FBSyxFQUFFdkI7RUFBZ0IsR0FDbERXLFFBQzJCLENBQUM7QUFFbkMsQ0FBQyxDQUFDO0FBRUYsU0FBUWhCLGVBQWUsRUFBRUUsY0FBYyxFQUFFYSxnQkFBZ0IiLCJpZ25vcmVMaXN0IjpbXX0=
|
package/build/utils/icon.js
CHANGED
|
@@ -2,22 +2,32 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
|
|
|
2
2
|
import BaseComponent from "../base-component";
|
|
3
3
|
import FontAwesomeIcon from "react-native-vector-icons/FontAwesome";
|
|
4
4
|
import memo from "set-state-compare/src/memo";
|
|
5
|
-
import React from "react";
|
|
5
|
+
import React, { useMemo } from "react";
|
|
6
6
|
import { shapeComponent } from "set-state-compare/src/shape-component";
|
|
7
|
-
import {
|
|
7
|
+
import { useMergedStyle } from "./default-style";
|
|
8
8
|
export default memo(shapeComponent(class ApiMakerUtilsIcon extends BaseComponent {
|
|
9
9
|
render() {
|
|
10
|
-
const defaultStyle = useDefaultStyle();
|
|
11
10
|
const {
|
|
12
11
|
style,
|
|
13
12
|
...restProps
|
|
14
13
|
} = this.props;
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
},
|
|
14
|
+
const {
|
|
15
|
+
stylesList
|
|
16
|
+
} = useMergedStyle(style, "Text");
|
|
17
|
+
|
|
18
|
+
// Only forward some styles like color
|
|
19
|
+
const actualStylesList = useMemo(() => {
|
|
20
|
+
const actualStylesList = [];
|
|
21
|
+
for (const style of stylesList) {
|
|
22
|
+
if ("color" in style) {
|
|
23
|
+
actualStylesList.push(style);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return actualStylesList;
|
|
27
|
+
}, [stylesList, style]);
|
|
18
28
|
return /*#__PURE__*/React.createElement(FontAwesomeIcon, _extends({
|
|
19
|
-
style:
|
|
29
|
+
style: actualStylesList
|
|
20
30
|
}, restProps));
|
|
21
31
|
}
|
|
22
32
|
}));
|
|
23
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJCYXNlQ29tcG9uZW50IiwiRm9udEF3ZXNvbWVJY29uIiwibWVtbyIsIlJlYWN0IiwidXNlTWVtbyIsInNoYXBlQ29tcG9uZW50IiwidXNlTWVyZ2VkU3R5bGUiLCJBcGlNYWtlclV0aWxzSWNvbiIsInJlbmRlciIsInN0eWxlIiwicmVzdFByb3BzIiwicHJvcHMiLCJzdHlsZXNMaXN0IiwiYWN0dWFsU3R5bGVzTGlzdCIsInB1c2giLCJjcmVhdGVFbGVtZW50IiwiX2V4dGVuZHMiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaWNvbi5qc3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEJhc2VDb21wb25lbnQgZnJvbSBcIi4uL2Jhc2UtY29tcG9uZW50XCJcbmltcG9ydCBGb250QXdlc29tZUljb24gZnJvbSBcInJlYWN0LW5hdGl2ZS12ZWN0b3ItaWNvbnMvRm9udEF3ZXNvbWVcIlxuaW1wb3J0IG1lbW8gZnJvbSBcInNldC1zdGF0ZS1jb21wYXJlL3NyYy9tZW1vXCJcbmltcG9ydCBSZWFjdCwge3VzZU1lbW99IGZyb20gXCJyZWFjdFwiXG5pbXBvcnQge3NoYXBlQ29tcG9uZW50fSBmcm9tIFwic2V0LXN0YXRlLWNvbXBhcmUvc3JjL3NoYXBlLWNvbXBvbmVudFwiXG5pbXBvcnQge3VzZU1lcmdlZFN0eWxlfSBmcm9tIFwiLi9kZWZhdWx0LXN0eWxlXCJcblxuZXhwb3J0IGRlZmF1bHQgbWVtbyhzaGFwZUNvbXBvbmVudChjbGFzcyBBcGlNYWtlclV0aWxzSWNvbiBleHRlbmRzIEJhc2VDb21wb25lbnQge1xuICByZW5kZXIoKSB7XG4gICAgY29uc3Qge3N0eWxlLCAuLi5yZXN0UHJvcHN9ID0gdGhpcy5wcm9wc1xuICAgIGNvbnN0IHtzdHlsZXNMaXN0fSA9IHVzZU1lcmdlZFN0eWxlKHN0eWxlLCBcIlRleHRcIilcblxuICAgIC8vIE9ubHkgZm9yd2FyZCBzb21lIHN0eWxlcyBsaWtlIGNvbG9yXG4gICAgY29uc3QgYWN0dWFsU3R5bGVzTGlzdCA9IHVzZU1lbW8oKCkgPT4ge1xuICAgICAgY29uc3QgYWN0dWFsU3R5bGVzTGlzdCA9IFtdXG5cbiAgICAgIGZvciAoY29uc3Qgc3R5bGUgb2Ygc3R5bGVzTGlzdCkge1xuICAgICAgICBpZiAoXCJjb2xvclwiIGluIHN0eWxlKSB7XG4gICAgICAgICAgYWN0dWFsU3R5bGVzTGlzdC5wdXNoKHN0eWxlKVxuICAgICAgICB9XG4gICAgICB9XG5cbiAgICAgIHJldHVybiBhY3R1YWxTdHlsZXNMaXN0XG4gICAgfSwgW3N0eWxlc0xpc3QsIHN0eWxlXSlcblxuICAgIHJldHVybiAoXG4gICAgICA8Rm9udEF3ZXNvbWVJY29uIHN0eWxlPXthY3R1YWxTdHlsZXNMaXN0fSB7Li4ucmVzdFByb3BzfSAvPlxuICAgIClcbiAgfVxufSkpXG4iXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPQSxhQUFhLE1BQU0sbUJBQW1CO0FBQzdDLE9BQU9DLGVBQWUsTUFBTSx1Q0FBdUM7QUFDbkUsT0FBT0MsSUFBSSxNQUFNLDRCQUE0QjtBQUM3QyxPQUFPQyxLQUFLLElBQUdDLE9BQU8sUUFBTyxPQUFPO0FBQ3BDLFNBQVFDLGNBQWMsUUFBTyx1Q0FBdUM7QUFDcEUsU0FBUUMsY0FBYyxRQUFPLGlCQUFpQjtBQUU5QyxlQUFlSixJQUFJLENBQUNHLGNBQWMsQ0FBQyxNQUFNRSxpQkFBaUIsU0FBU1AsYUFBYSxDQUFDO0VBQy9FUSxNQUFNQSxDQUFBLEVBQUc7SUFDUCxNQUFNO01BQUNDLEtBQUs7TUFBRSxHQUFHQztJQUFTLENBQUMsR0FBRyxJQUFJLENBQUNDLEtBQUs7SUFDeEMsTUFBTTtNQUFDQztJQUFVLENBQUMsR0FBR04sY0FBYyxDQUFDRyxLQUFLLEVBQUUsTUFBTSxDQUFDOztJQUVsRDtJQUNBLE1BQU1JLGdCQUFnQixHQUFHVCxPQUFPLENBQUMsTUFBTTtNQUNyQyxNQUFNUyxnQkFBZ0IsR0FBRyxFQUFFO01BRTNCLEtBQUssTUFBTUosS0FBSyxJQUFJRyxVQUFVLEVBQUU7UUFDOUIsSUFBSSxPQUFPLElBQUlILEtBQUssRUFBRTtVQUNwQkksZ0JBQWdCLENBQUNDLElBQUksQ0FBQ0wsS0FBSyxDQUFDO1FBQzlCO01BQ0Y7TUFFQSxPQUFPSSxnQkFBZ0I7SUFDekIsQ0FBQyxFQUFFLENBQUNELFVBQVUsRUFBRUgsS0FBSyxDQUFDLENBQUM7SUFFdkIsb0JBQ0VOLEtBQUEsQ0FBQVksYUFBQSxDQUFDZCxlQUFlLEVBQUFlLFFBQUE7TUFBQ1AsS0FBSyxFQUFFSTtJQUFpQixHQUFLSCxTQUFTLENBQUcsQ0FBQztFQUUvRDtBQUNGLENBQUMsQ0FBQyxDQUFDIiwiaWdub3JlTGlzdCI6W119
|
package/build/utils/text.js
CHANGED
|
@@ -1,44 +1,24 @@
|
|
|
1
1
|
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
2
2
|
import memo from "set-state-compare/src/memo";
|
|
3
|
-
import React
|
|
3
|
+
import React from "react";
|
|
4
4
|
import { Text } from "react-native";
|
|
5
|
-
import {
|
|
5
|
+
import { useMergedStyle, WithDefaultStyle } from "./default-style";
|
|
6
6
|
export default memo(props => {
|
|
7
7
|
const {
|
|
8
8
|
style,
|
|
9
9
|
...restProps
|
|
10
10
|
} = props;
|
|
11
|
-
const defaultStyle = useDefaultStyle();
|
|
12
11
|
const {
|
|
13
|
-
|
|
12
|
+
newDefaultStyle,
|
|
14
13
|
stylesList
|
|
15
|
-
} =
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
Object.assign(actualStyle, defaultStyle.Text);
|
|
20
|
-
stylesList.push(defaultStyle.Text);
|
|
21
|
-
}
|
|
22
|
-
if (style) {
|
|
23
|
-
if (Array.isArray(style)) {
|
|
24
|
-
for (const styleI of style) {
|
|
25
|
-
Object.assign(actualStyle, styleI);
|
|
26
|
-
stylesList.push(styleI);
|
|
27
|
-
}
|
|
28
|
-
} else {
|
|
29
|
-
Object.assign(actualStyle, style);
|
|
30
|
-
stylesList.push(style);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
return {
|
|
34
|
-
actualStyle,
|
|
35
|
-
stylesList
|
|
36
|
-
};
|
|
37
|
-
}, [defaultStyle?.Text, style]);
|
|
14
|
+
} = useMergedStyle(style, "Text");
|
|
15
|
+
console.log("ApiMaker Text", {
|
|
16
|
+
stylesList
|
|
17
|
+
});
|
|
38
18
|
return /*#__PURE__*/React.createElement(WithDefaultStyle, {
|
|
39
|
-
style:
|
|
19
|
+
style: newDefaultStyle
|
|
40
20
|
}, /*#__PURE__*/React.createElement(Text, _extends({
|
|
41
21
|
style: stylesList
|
|
42
22
|
}, restProps)));
|
|
43
23
|
});
|
|
44
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJtZW1vIiwiUmVhY3QiLCJUZXh0IiwidXNlTWVyZ2VkU3R5bGUiLCJXaXRoRGVmYXVsdFN0eWxlIiwicHJvcHMiLCJzdHlsZSIsInJlc3RQcm9wcyIsIm5ld0RlZmF1bHRTdHlsZSIsInN0eWxlc0xpc3QiLCJjb25zb2xlIiwibG9nIiwiY3JlYXRlRWxlbWVudCIsIl9leHRlbmRzIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3RleHQuanN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBtZW1vIGZyb20gXCJzZXQtc3RhdGUtY29tcGFyZS9zcmMvbWVtb1wiXG5pbXBvcnQgUmVhY3QgZnJvbSBcInJlYWN0XCJcbmltcG9ydCB7VGV4dH0gZnJvbSBcInJlYWN0LW5hdGl2ZVwiXG5pbXBvcnQge3VzZU1lcmdlZFN0eWxlLCBXaXRoRGVmYXVsdFN0eWxlfSBmcm9tIFwiLi9kZWZhdWx0LXN0eWxlXCJcblxuZXhwb3J0IGRlZmF1bHQgbWVtbygocHJvcHMpID0+IHtcbiAgY29uc3Qge3N0eWxlLCAuLi5yZXN0UHJvcHN9ID0gcHJvcHNcbiAgY29uc3Qge25ld0RlZmF1bHRTdHlsZSwgc3R5bGVzTGlzdH0gPSB1c2VNZXJnZWRTdHlsZShzdHlsZSwgXCJUZXh0XCIpXG5cbiAgY29uc29sZS5sb2coXCJBcGlNYWtlciBUZXh0XCIsIHtzdHlsZXNMaXN0fSlcblxuICByZXR1cm4gKFxuICAgIDxXaXRoRGVmYXVsdFN0eWxlIHN0eWxlPXtuZXdEZWZhdWx0U3R5bGV9PlxuICAgICAgPFRleHQgc3R5bGU9e3N0eWxlc0xpc3R9IHsuLi5yZXN0UHJvcHN9IC8+XG4gICAgPC9XaXRoRGVmYXVsdFN0eWxlPlxuICApXG59KVxuIl0sIm1hcHBpbmdzIjoiO0FBQUEsT0FBT0EsSUFBSSxNQUFNLDRCQUE0QjtBQUM3QyxPQUFPQyxLQUFLLE1BQU0sT0FBTztBQUN6QixTQUFRQyxJQUFJLFFBQU8sY0FBYztBQUNqQyxTQUFRQyxjQUFjLEVBQUVDLGdCQUFnQixRQUFPLGlCQUFpQjtBQUVoRSxlQUFlSixJQUFJLENBQUVLLEtBQUssSUFBSztFQUM3QixNQUFNO0lBQUNDLEtBQUs7SUFBRSxHQUFHQztFQUFTLENBQUMsR0FBR0YsS0FBSztFQUNuQyxNQUFNO0lBQUNHLGVBQWU7SUFBRUM7RUFBVSxDQUFDLEdBQUdOLGNBQWMsQ0FBQ0csS0FBSyxFQUFFLE1BQU0sQ0FBQztFQUVuRUksT0FBTyxDQUFDQyxHQUFHLENBQUMsZUFBZSxFQUFFO0lBQUNGO0VBQVUsQ0FBQyxDQUFDO0VBRTFDLG9CQUNFUixLQUFBLENBQUFXLGFBQUEsQ0FBQ1IsZ0JBQWdCO0lBQUNFLEtBQUssRUFBRUU7RUFBZ0IsZ0JBQ3ZDUCxLQUFBLENBQUFXLGFBQUEsQ0FBQ1YsSUFBSSxFQUFBVyxRQUFBO0lBQUNQLEtBQUssRUFBRUc7RUFBVyxHQUFLRixTQUFTLENBQUcsQ0FDekIsQ0FBQztBQUV2QixDQUFDLENBQUMiLCJpZ25vcmVMaXN0IjpbXX0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kaspernj/api-maker",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.2014",
|
|
4
4
|
"description": "My new module",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"form-data-objectizer": ">= 1.0.0",
|
|
44
44
|
"form-serialize": ">= 0.7.2",
|
|
45
45
|
"format-number": ">= 3.0.0",
|
|
46
|
-
"incorporator": ">= 1.0.
|
|
46
|
+
"incorporator": ">= 1.0.3",
|
|
47
47
|
"inflection": ">= 1.12.0",
|
|
48
48
|
"js-money": ">= 0.6.3",
|
|
49
49
|
"numberable": ">= 1.0.0",
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import React, {createContext, useContext} from "react"
|
|
1
|
+
import React, {createContext, useContext, useMemo} from "react"
|
|
2
|
+
import {incorporate} from "incorporator"
|
|
2
3
|
import memo from "set-state-compare/src/memo"
|
|
3
4
|
|
|
4
5
|
const DefaultStyleContext = createContext({
|
|
5
|
-
Text:
|
|
6
|
+
Text: []
|
|
6
7
|
})
|
|
7
8
|
|
|
8
9
|
const useDefaultStyle = () => {
|
|
@@ -11,15 +12,71 @@ const useDefaultStyle = () => {
|
|
|
11
12
|
return defaultStyle
|
|
12
13
|
}
|
|
13
14
|
|
|
14
|
-
const
|
|
15
|
+
const useMergedStyle = (style, elementType) => {
|
|
16
|
+
const defaultStyle = useDefaultStyle()
|
|
17
|
+
|
|
18
|
+
const {newDefaultStyle, stylesList} = useMemo(() => {
|
|
19
|
+
const textDefaultStyle = defaultStyle[elementType]
|
|
20
|
+
|
|
21
|
+
if (!style) {
|
|
22
|
+
return {newDefaultStyle: defaultStyle, stylesList: textDefaultStyle}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const stylesList = textDefaultStyle ? [...textDefaultStyle] : []
|
|
26
|
+
|
|
27
|
+
if (Array.isArray(style)) {
|
|
28
|
+
for (const styleI of style) {
|
|
29
|
+
stylesList.push(styleI)
|
|
30
|
+
}
|
|
31
|
+
} else {
|
|
32
|
+
console.log("Pushing custom style", {style})
|
|
33
|
+
stylesList.push(style)
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
return {newDefaultStyle, stylesList}
|
|
37
|
+
}, [defaultStyle[elementType], style])
|
|
38
|
+
|
|
39
|
+
const actualNewDefaultStyle = useMemo(() => {
|
|
40
|
+
const actualNewDefaultStyle = {...defaultStyle}
|
|
41
|
+
|
|
42
|
+
actualNewDefaultStyle[elementType] = stylesList
|
|
43
|
+
|
|
44
|
+
return actualNewDefaultStyle
|
|
45
|
+
}, [defaultStyle, newDefaultStyle])
|
|
46
|
+
|
|
47
|
+
return {newDefaultStyle: actualNewDefaultStyle, stylesList}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
const WithDefaultStyle = memo(({children, style, ...restProps}) => {
|
|
51
|
+
if (Object.keys(restProps).length > 0) {
|
|
52
|
+
throw new Error(`Unhandled props: ${Object.keys(restProps).join(", ")}`)
|
|
53
|
+
}
|
|
54
|
+
|
|
15
55
|
const defaultStyle = useContext(DefaultStyleContext)
|
|
16
|
-
|
|
56
|
+
|
|
57
|
+
console.log("WithDefaultStyle BEFORE", JSON.stringify(defaultStyle))
|
|
58
|
+
|
|
59
|
+
const newDefaultStyle = useMemo(() => {
|
|
60
|
+
for (const key in style) {
|
|
61
|
+
if (!(key in defaultStyle)) {
|
|
62
|
+
throw new Error(`Invalid element type given: ${key}`)
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
const newDefaultStyle = {}
|
|
67
|
+
|
|
68
|
+
incorporate(newDefaultStyle, defaultStyle, style)
|
|
69
|
+
|
|
70
|
+
return newDefaultStyle
|
|
71
|
+
}, [defaultStyle, style])
|
|
72
|
+
|
|
73
|
+
console.log("WithDefaultStyle AFTER", JSON.stringify(defaultStyle))
|
|
17
74
|
|
|
18
75
|
return (
|
|
19
76
|
<DefaultStyleContext.Provider value={newDefaultStyle}>
|
|
20
|
-
{
|
|
77
|
+
{children}
|
|
21
78
|
</DefaultStyleContext.Provider>
|
|
22
79
|
)
|
|
23
80
|
})
|
|
24
81
|
|
|
25
|
-
export {useDefaultStyle, WithDefaultStyle}
|
|
82
|
+
export {useDefaultStyle, useMergedStyle, WithDefaultStyle}
|
package/src/utils/icon.jsx
CHANGED
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
import BaseComponent from "../base-component"
|
|
2
2
|
import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
|
|
3
3
|
import memo from "set-state-compare/src/memo"
|
|
4
|
-
import React from "react"
|
|
4
|
+
import React, {useMemo} from "react"
|
|
5
5
|
import {shapeComponent} from "set-state-compare/src/shape-component"
|
|
6
|
-
import {
|
|
6
|
+
import {useMergedStyle} from "./default-style"
|
|
7
7
|
|
|
8
8
|
export default memo(shapeComponent(class ApiMakerUtilsIcon extends BaseComponent {
|
|
9
9
|
render() {
|
|
10
|
-
const defaultStyle = useDefaultStyle()
|
|
11
10
|
const {style, ...restProps} = this.props
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
)
|
|
11
|
+
const {stylesList} = useMergedStyle(style, "Text")
|
|
12
|
+
|
|
13
|
+
// Only forward some styles like color
|
|
14
|
+
const actualStylesList = useMemo(() => {
|
|
15
|
+
const actualStylesList = []
|
|
16
|
+
|
|
17
|
+
for (const style of stylesList) {
|
|
18
|
+
if ("color" in style) {
|
|
19
|
+
actualStylesList.push(style)
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return actualStylesList
|
|
24
|
+
}, [stylesList, style])
|
|
16
25
|
|
|
17
26
|
return (
|
|
18
|
-
<FontAwesomeIcon style={
|
|
27
|
+
<FontAwesomeIcon style={actualStylesList} {...restProps} />
|
|
19
28
|
)
|
|
20
29
|
}
|
|
21
30
|
}))
|
package/src/utils/text.jsx
CHANGED
|
@@ -1,37 +1,16 @@
|
|
|
1
1
|
import memo from "set-state-compare/src/memo"
|
|
2
|
-
import React
|
|
2
|
+
import React from "react"
|
|
3
3
|
import {Text} from "react-native"
|
|
4
|
-
import {
|
|
4
|
+
import {useMergedStyle, WithDefaultStyle} from "./default-style"
|
|
5
5
|
|
|
6
6
|
export default memo((props) => {
|
|
7
7
|
const {style, ...restProps} = props
|
|
8
|
-
const
|
|
9
|
-
const {actualStyle, stylesList} = useMemo(() => {
|
|
10
|
-
const stylesList = []
|
|
11
|
-
const actualStyle = {}
|
|
8
|
+
const {newDefaultStyle, stylesList} = useMergedStyle(style, "Text")
|
|
12
9
|
|
|
13
|
-
|
|
14
|
-
Object.assign(actualStyle, defaultStyle.Text)
|
|
15
|
-
stylesList.push(defaultStyle.Text)
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
if (style) {
|
|
19
|
-
if (Array.isArray(style)) {
|
|
20
|
-
for (const styleI of style) {
|
|
21
|
-
Object.assign(actualStyle, styleI)
|
|
22
|
-
stylesList.push(styleI)
|
|
23
|
-
}
|
|
24
|
-
} else {
|
|
25
|
-
Object.assign(actualStyle, style)
|
|
26
|
-
stylesList.push(style)
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
return {actualStyle, stylesList}
|
|
31
|
-
}, [defaultStyle?.Text, style])
|
|
10
|
+
console.log("ApiMaker Text", {stylesList})
|
|
32
11
|
|
|
33
12
|
return (
|
|
34
|
-
<WithDefaultStyle style={
|
|
13
|
+
<WithDefaultStyle style={newDefaultStyle}>
|
|
35
14
|
<Text style={stylesList} {...restProps} />
|
|
36
15
|
</WithDefaultStyle>
|
|
37
16
|
)
|