@builder.io/react 1.1.47-2 → 1.1.47-6
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/dist/builder-react-lite.cjs.js +1 -1
- package/dist/builder-react-lite.esm.js +1 -1
- package/dist/builder-react.browser.js +2 -2
- package/dist/builder-react.browser.js.map +1 -1
- package/dist/builder-react.cjs.js +2 -2
- package/dist/builder-react.cjs.js.map +1 -1
- package/dist/builder-react.es5.js +2 -2
- package/dist/builder-react.es5.js.map +1 -1
- package/dist/builder-react.unpkg.js +2 -2
- package/dist/builder-react.unpkg.js.map +1 -1
- package/dist/lib/package.json +1 -1
- package/dist/lib/src/blocks/Button.js +1 -1
- package/dist/lib/src/blocks/CustomCode.js +19 -7
- package/dist/lib/src/blocks/CustomCode.js.map +1 -1
- package/dist/lib/src/blocks/Mutation.js +1 -0
- package/dist/lib/src/blocks/Mutation.js.map +1 -1
- package/package.json +1 -1
- package/src/blocks/Button.tsx +1 -1
- package/src/blocks/CustomCode.tsx +18 -10
- package/src/blocks/Mutation.tsx +1 -0
package/dist/lib/package.json
CHANGED
|
@@ -51,7 +51,7 @@ exports.Button = with_builder_1.withBuilder(ButtonComponent, {
|
|
|
51
51
|
paddingBottom: '15px',
|
|
52
52
|
paddingLeft: '25px',
|
|
53
53
|
paddingRight: '25px',
|
|
54
|
-
backgroundColor: '#
|
|
54
|
+
backgroundColor: '#000000',
|
|
55
55
|
color: 'white',
|
|
56
56
|
borderRadius: '4px',
|
|
57
57
|
textAlign: 'center',
|
|
@@ -34,9 +34,7 @@ var with_builder_1 = require("../functions/with-builder");
|
|
|
34
34
|
var globalReplaceNodes = {} || null;
|
|
35
35
|
var isShopify = sdk_1.Builder.isBrowser && 'Shopify' in window;
|
|
36
36
|
if (sdk_1.Builder.isBrowser && globalReplaceNodes) {
|
|
37
|
-
var customCodeQuerySelector_1 =
|
|
38
|
-
? '.builder-custom-code'
|
|
39
|
-
: '.builder-custom-code.replace-nodes';
|
|
37
|
+
var customCodeQuerySelector_1 = '.builder-custom-code';
|
|
40
38
|
try {
|
|
41
39
|
var allCustomCodeElements_1 = Array.from(document.querySelectorAll(customCodeQuerySelector_1));
|
|
42
40
|
// Search each template element (if present) for custom code blocks since
|
|
@@ -57,7 +55,7 @@ if (sdk_1.Builder.isBrowser && globalReplaceNodes) {
|
|
|
57
55
|
var id = parent && parent.getAttribute('builder-id');
|
|
58
56
|
if (id) {
|
|
59
57
|
globalReplaceNodes[id] = globalReplaceNodes[id] || [];
|
|
60
|
-
globalReplaceNodes[id].push(el);
|
|
58
|
+
globalReplaceNodes[id].push(isShopify ? el : el.cloneNode(true));
|
|
61
59
|
}
|
|
62
60
|
});
|
|
63
61
|
}
|
|
@@ -105,15 +103,28 @@ var CustomCodeComponent = /** @class */ (function (_super) {
|
|
|
105
103
|
enumerable: true,
|
|
106
104
|
configurable: true
|
|
107
105
|
});
|
|
106
|
+
Object.defineProperty(CustomCodeComponent.prototype, "isHydrating", {
|
|
107
|
+
get: function () {
|
|
108
|
+
return !isShopify && this.originalRef;
|
|
109
|
+
},
|
|
110
|
+
enumerable: true,
|
|
111
|
+
configurable: true
|
|
112
|
+
});
|
|
108
113
|
CustomCodeComponent.prototype.componentDidUpdate = function (prevProps) {
|
|
109
114
|
if (this.props.code !== prevProps.code) {
|
|
110
115
|
this.findAndRunScripts();
|
|
111
116
|
}
|
|
112
117
|
};
|
|
113
118
|
CustomCodeComponent.prototype.componentDidMount = function () {
|
|
119
|
+
var _this = this;
|
|
114
120
|
this.firstLoad = false;
|
|
115
121
|
if (!this.replaceNodes) {
|
|
116
|
-
this.
|
|
122
|
+
if (this.isHydrating) {
|
|
123
|
+
sdk_1.Builder.nextTick(function () { return _this.findAndRunScripts(); });
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
this.findAndRunScripts();
|
|
127
|
+
}
|
|
117
128
|
}
|
|
118
129
|
if (sdk_1.Builder.isBrowser && this.replaceNodes && this.originalRef && this.elementRef) {
|
|
119
130
|
this.elementRef.appendChild(this.originalRef);
|
|
@@ -152,7 +163,8 @@ var CustomCodeComponent = /** @class */ (function (_super) {
|
|
|
152
163
|
};
|
|
153
164
|
Object.defineProperty(CustomCodeComponent.prototype, "code", {
|
|
154
165
|
get: function () {
|
|
155
|
-
if
|
|
166
|
+
// when ssr'd by nextjs it'll break hydration if initial client render doesn't match ssr
|
|
167
|
+
if ((sdk_1.Builder.isServer || this.isHydrating && this.firstLoad) && this.props.scriptsClientOnly) {
|
|
156
168
|
return (this.props.code || '').replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
|
|
157
169
|
}
|
|
158
170
|
return this.props.code;
|
|
@@ -166,7 +178,7 @@ var CustomCodeComponent = /** @class */ (function (_super) {
|
|
|
166
178
|
// like embed
|
|
167
179
|
return (react_1.default.createElement("div", __assign({ ref: function (ref) { return (_this.elementRef = ref); },
|
|
168
180
|
// TODO: add a class when node replaced in (?)
|
|
169
|
-
className: 'builder-custom-code'
|
|
181
|
+
className: 'builder-custom-code' }, (!this.replaceNodes &&
|
|
170
182
|
!this.noReactRender && {
|
|
171
183
|
dangerouslySetInnerHTML: { __html: this.code },
|
|
172
184
|
}))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomCode.js","sourceRoot":"","sources":["../../../../src/blocks/CustomCode.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,uCAA0D;AAC1D,0DAAwD;AASxD,kFAAkF;AAClF,IAAM,kBAAkB,GAAI,
|
|
1
|
+
{"version":3,"file":"CustomCode.js","sourceRoot":"","sources":["../../../../src/blocks/CustomCode.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mutation.js","sourceRoot":"","sources":["../../../../src/blocks/Mutation.tsx"],"names":[],"mappings":";;;;;AAAA,eAAe;AACf,sCAAoC;AACpC,gDAA0B;AAC1B,uCAA0D;AAC1D,mFAAuE;AAEvE,aAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE;IAClC,IAAI,EAAE,kBAAkB;IACxB,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE;QACN;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE;gBACJ;oBACE,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,SAAS;oBAChB,UAAU,EAAE,oEAAoE;iBACjF;gBACD;oBACE,KAAK,EAAE,QAAQ;oBACf,KAAK,EAAE,UAAU;oBACjB,UAAU,EAAE,qDAAqD;iBAClE;aACF;SACF;QACD;YACE,IAAI,EAAE,UAAU;YAChB,4BAA4B;YAC5B,IAAI,EAAE,qBAAqB;SAC5B;KACF;CACF,CAAC,CAAC;AAQH,SAAgB,QAAQ,CAAC,KAAoB;;IAC3C,IAAM,GAAG,GAAG,eAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAEtD,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAA,IAAI;QACrC,mCAAmC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;YAC7B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;SACrB;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAQ,CAAC,iBAAkB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAM,QAAQ,SAAG,KAAK,CAAC,YAAY,0CAAE,QAAQ,CAAC;IAE9C,OAAO,CACL,qBAAM,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;QACxC,WAAC,wCAAa,IACZ,KAAK,EAAE;gBACL,OAAO,EAAE,QAAQ;aAClB,EACD,KAAK,QACL,eAAe,QAAE,KAAK,CAAC,YAAY,0CAAE,EAAE,EACvC,QAAQ,EAAC,eAAe,EACxB,MAAM,EAAE,QAAQ,GAChB,CACG,CACR,CAAC;AACJ,CAAC;AA1BD,4BA0BC;AAED,SAAS,kBAAkB,CAAC,QAAgB,EAAE,EAA2B;IACvE,eAAK,CAAC,eAAe,CAAC;QACpB,IAAI;YACF,IAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACzD,IAAI,eAAe,EAAE;gBACnB,EAAE,CAAC,eAAe,CAAC,CAAC;gBACpB,OAAO;aACR;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;QAED,IAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC;YACpC,IAAI;gBACF,IAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACtD,IAAI,YAAY,EAAE;oBAChB,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACtB,EAAE,CAAC,YAAY,CAAC,CAAC;iBAClB;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC9B,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,OAAO;YACL,QAAQ,CAAC,UAAU,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AACjB,CAAC"}
|
|
1
|
+
{"version":3,"file":"Mutation.js","sourceRoot":"","sources":["../../../../src/blocks/Mutation.tsx"],"names":[],"mappings":";;;;;AAAA,eAAe;AACf,sCAAoC;AACpC,gDAA0B;AAC1B,uCAA0D;AAC1D,mFAAuE;AAEvE,aAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE;IAClC,IAAI,EAAE,kBAAkB;IACxB,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,kBAAkB,EAAE,IAAI;IACxB,MAAM,EAAE;QACN;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE;gBACJ;oBACE,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,SAAS;oBAChB,UAAU,EAAE,oEAAoE;iBACjF;gBACD;oBACE,KAAK,EAAE,QAAQ;oBACf,KAAK,EAAE,UAAU;oBACjB,UAAU,EAAE,qDAAqD;iBAClE;aACF;SACF;QACD;YACE,IAAI,EAAE,UAAU;YAChB,4BAA4B;YAC5B,IAAI,EAAE,qBAAqB;SAC5B;KACF;CACF,CAAC,CAAC;AAQH,SAAgB,QAAQ,CAAC,KAAoB;;IAC3C,IAAM,GAAG,GAAG,eAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAEtD,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAA,IAAI;QACrC,mCAAmC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;YAC7B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;SACrB;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAQ,CAAC,iBAAkB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAM,QAAQ,SAAG,KAAK,CAAC,YAAY,0CAAE,QAAQ,CAAC;IAE9C,OAAO,CACL,qBAAM,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;QACxC,WAAC,wCAAa,IACZ,KAAK,EAAE;gBACL,OAAO,EAAE,QAAQ;aAClB,EACD,KAAK,QACL,eAAe,QAAE,KAAK,CAAC,YAAY,0CAAE,EAAE,EACvC,QAAQ,EAAC,eAAe,EACxB,MAAM,EAAE,QAAQ,GAChB,CACG,CACR,CAAC;AACJ,CAAC;AA1BD,4BA0BC;AAED,SAAS,kBAAkB,CAAC,QAAgB,EAAE,EAA2B;IACvE,eAAK,CAAC,eAAe,CAAC;QACpB,IAAI;YACF,IAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACzD,IAAI,eAAe,EAAE;gBACnB,EAAE,CAAC,eAAe,CAAC,CAAC;gBACpB,OAAO;aACR;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;QAED,IAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC;YACpC,IAAI;gBACF,IAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACtD,IAAI,YAAY,EAAE;oBAChB,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACtB,EAAE,CAAC,YAAY,CAAC,CAAC;iBAClB;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC9B,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,OAAO;YACL,QAAQ,CAAC,UAAU,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AACjB,CAAC"}
|
package/package.json
CHANGED
package/src/blocks/Button.tsx
CHANGED
|
@@ -10,14 +10,13 @@ interface Props {
|
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
// TODO: settings context to pass this down. do in shopify-specific generated code
|
|
13
|
-
const globalReplaceNodes = ({} as { [key: string]:
|
|
13
|
+
const globalReplaceNodes = ({} as { [key: string]: Node[] }) || null;
|
|
14
14
|
|
|
15
15
|
const isShopify = Builder.isBrowser && 'Shopify' in window;
|
|
16
16
|
|
|
17
17
|
if (Builder.isBrowser && globalReplaceNodes) {
|
|
18
|
-
const customCodeQuerySelector =
|
|
19
|
-
|
|
20
|
-
: '.builder-custom-code.replace-nodes';
|
|
18
|
+
const customCodeQuerySelector = '.builder-custom-code';
|
|
19
|
+
|
|
21
20
|
try {
|
|
22
21
|
let allCustomCodeElements = Array.from(document.querySelectorAll(customCodeQuerySelector));
|
|
23
22
|
|
|
@@ -40,7 +39,7 @@ if (Builder.isBrowser && globalReplaceNodes) {
|
|
|
40
39
|
const id = parent && parent.getAttribute('builder-id');
|
|
41
40
|
if (id) {
|
|
42
41
|
globalReplaceNodes[id] = globalReplaceNodes[id] || [];
|
|
43
|
-
globalReplaceNodes[id].push(el);
|
|
42
|
+
globalReplaceNodes[id].push(isShopify ? el : el.cloneNode(true));
|
|
44
43
|
}
|
|
45
44
|
});
|
|
46
45
|
} catch (err) {
|
|
@@ -50,7 +49,7 @@ if (Builder.isBrowser && globalReplaceNodes) {
|
|
|
50
49
|
|
|
51
50
|
class CustomCodeComponent extends React.Component<Props> {
|
|
52
51
|
elementRef: Element | null = null;
|
|
53
|
-
originalRef: Element | null = null;
|
|
52
|
+
originalRef: Node | Element | null = null;
|
|
54
53
|
|
|
55
54
|
scriptsInserted = new Set();
|
|
56
55
|
scriptsRun = new Set();
|
|
@@ -80,7 +79,7 @@ class CustomCodeComponent extends React.Component<Props> {
|
|
|
80
79
|
if (existing.length === 1) {
|
|
81
80
|
const node = existing[0];
|
|
82
81
|
this.originalRef = node as HTMLElement;
|
|
83
|
-
this.originalRef.remove();
|
|
82
|
+
(this.originalRef as Element).remove();
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
85
|
}
|
|
@@ -91,6 +90,10 @@ class CustomCodeComponent extends React.Component<Props> {
|
|
|
91
90
|
return Boolean(isShopify && this.props.code?.match(/{[{%]/g));
|
|
92
91
|
}
|
|
93
92
|
|
|
93
|
+
get isHydrating() {
|
|
94
|
+
return !isShopify && this.originalRef;
|
|
95
|
+
}
|
|
96
|
+
|
|
94
97
|
componentDidUpdate(prevProps: Props) {
|
|
95
98
|
if (this.props.code !== prevProps.code) {
|
|
96
99
|
this.findAndRunScripts();
|
|
@@ -100,7 +103,11 @@ class CustomCodeComponent extends React.Component<Props> {
|
|
|
100
103
|
componentDidMount() {
|
|
101
104
|
this.firstLoad = false;
|
|
102
105
|
if (!this.replaceNodes) {
|
|
103
|
-
this.
|
|
106
|
+
if (this.isHydrating) {
|
|
107
|
+
Builder.nextTick(() => this.findAndRunScripts());
|
|
108
|
+
} else {
|
|
109
|
+
this.findAndRunScripts();
|
|
110
|
+
}
|
|
104
111
|
}
|
|
105
112
|
if (Builder.isBrowser && this.replaceNodes && this.originalRef && this.elementRef) {
|
|
106
113
|
this.elementRef.appendChild(this.originalRef);
|
|
@@ -142,7 +149,8 @@ class CustomCodeComponent extends React.Component<Props> {
|
|
|
142
149
|
}
|
|
143
150
|
|
|
144
151
|
get code() {
|
|
145
|
-
if
|
|
152
|
+
// when ssr'd by nextjs it'll break hydration if initial client render doesn't match ssr
|
|
153
|
+
if ((Builder.isServer || this.isHydrating && this.firstLoad) && this.props.scriptsClientOnly) {
|
|
146
154
|
return (this.props.code || '').replace(
|
|
147
155
|
/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
|
|
148
156
|
''
|
|
@@ -158,7 +166,7 @@ class CustomCodeComponent extends React.Component<Props> {
|
|
|
158
166
|
<div
|
|
159
167
|
ref={ref => (this.elementRef = ref)}
|
|
160
168
|
// TODO: add a class when node replaced in (?)
|
|
161
|
-
className=
|
|
169
|
+
className='builder-custom-code'
|
|
162
170
|
{...(!this.replaceNodes &&
|
|
163
171
|
!this.noReactRender && {
|
|
164
172
|
dangerouslySetInnerHTML: { __html: this.code },
|