@builder.io/react 2.0.6-2 → 2.0.6-5
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.cjs.js.map +1 -1
- package/dist/builder-react-lite.esm.js +1 -1
- package/dist/builder-react-lite.esm.js.map +1 -1
- package/dist/builder-react.browser.js +1 -1
- package/dist/builder-react.browser.js.map +1 -1
- package/dist/builder-react.cjs.js +1 -1
- package/dist/builder-react.cjs.js.map +1 -1
- package/dist/builder-react.es5.js +1 -1
- package/dist/builder-react.es5.js.map +1 -1
- package/dist/builder-react.unpkg.js +1 -1
- package/dist/builder-react.unpkg.js.map +1 -1
- package/dist/lib/package.json +1 -1
- package/dist/lib/src/components/builder-content.component.js +20 -3
- package/dist/lib/src/components/builder-content.component.js.map +1 -1
- package/dist/types/src/components/builder-content.component.d.ts +1 -0
- package/package.json +1 -1
- package/src/components/builder-content.component.tsx +17 -3
package/dist/lib/package.json
CHANGED
|
@@ -145,6 +145,13 @@ var BuilderContent = /** @class */ (function (_super) {
|
|
|
145
145
|
enumerable: false,
|
|
146
146
|
configurable: true
|
|
147
147
|
});
|
|
148
|
+
Object.defineProperty(BuilderContent.prototype, "isPreviewingOrEditing", {
|
|
149
|
+
get: function () {
|
|
150
|
+
return (sdk_1.builder.editingModel || sdk_1.builder.previewingModel) === this.name;
|
|
151
|
+
},
|
|
152
|
+
enumerable: false,
|
|
153
|
+
configurable: true
|
|
154
|
+
});
|
|
148
155
|
Object.defineProperty(BuilderContent.prototype, "options", {
|
|
149
156
|
get: function () {
|
|
150
157
|
var _a, _b;
|
|
@@ -152,9 +159,12 @@ var BuilderContent = /** @class */ (function (_super) {
|
|
|
152
159
|
if (!options.key && ((_a = this.props.content) === null || _a === void 0 ? void 0 : _a.id) && !sdk_1.Builder.isEditing && !sdk_1.Builder.isPreviewing) {
|
|
153
160
|
options.key = this.props.content.id;
|
|
154
161
|
}
|
|
162
|
+
if (!options.key && this.isPreviewingOrEditing) {
|
|
163
|
+
options.key = this.name + ':data';
|
|
164
|
+
}
|
|
155
165
|
if (this.props.content &&
|
|
156
166
|
!((_b = options.initialContent) === null || _b === void 0 ? void 0 : _b.length) &&
|
|
157
|
-
|
|
167
|
+
this.props.inline) {
|
|
158
168
|
options.initialContent = [this.props.content];
|
|
159
169
|
}
|
|
160
170
|
return options;
|
|
@@ -199,15 +209,22 @@ var BuilderContent = /** @class */ (function (_super) {
|
|
|
199
209
|
BuilderContent.prototype.subscribeToContent = function () {
|
|
200
210
|
var _this = this;
|
|
201
211
|
if (this.name !== '_inline') {
|
|
202
|
-
console.log(' here triggering subscribe with ', this.name, this.options, this.props);
|
|
203
212
|
// TODO:... using targeting...? express.request hmmm
|
|
204
213
|
this.subscriptions.add(sdk_1.builder.queueGetContent(this.name, this.options).subscribe(function (matches) {
|
|
205
214
|
var match = matches && matches[0];
|
|
206
|
-
console.log(' here got matches ', _this.name, _this.options, _this.props, match);
|
|
207
215
|
_this.setState({
|
|
208
216
|
data: match,
|
|
209
217
|
loading: false,
|
|
210
218
|
});
|
|
219
|
+
// // when BuilderContent is wrapping a BuilderComponent of the same model, the builderComponent is passing initialContent on on the same key
|
|
220
|
+
// // causing the sdk to resolve this call to the initialContent instead of the previewed/edited content
|
|
221
|
+
// // so we test here if the BuilderContent is being used directly ( not inlined ) and is being edited or previewed we get the content one more time
|
|
222
|
+
// const isPreviewing = (builder.editingModel || builder.previewingModel) === this.name;
|
|
223
|
+
// if (!this.props.inline && this.firstLoad && isPreviewing) {
|
|
224
|
+
// this.firstLoad = false;
|
|
225
|
+
// this.subscriptions.unsubscribe();
|
|
226
|
+
// this.subscribeToContent();
|
|
227
|
+
// }
|
|
211
228
|
if (match && _this.firstLoad) {
|
|
212
229
|
_this.firstLoad = false;
|
|
213
230
|
// TODO: autoTrack
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder-content.component.js","sourceRoot":"","sources":["../../../../src/components/builder-content.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,uCAMyB;AACzB,qCAAmC;AACnC,oFAA4F;AAC5F,6EAAiE;AA2CjE;;;;;GAKG;AACH;IAAsE,kCAErE;IAFD;QAAA,
|
|
1
|
+
{"version":3,"file":"builder-content.component.js","sourceRoot":"","sources":["../../../../src/components/builder-content.component.tsx"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,7 @@ export declare class BuilderContent<ContentType extends object = any> extends Re
|
|
|
55
55
|
get builder(): Builder;
|
|
56
56
|
get name(): string;
|
|
57
57
|
get renderedVariantId(): any;
|
|
58
|
+
get isPreviewingOrEditing(): boolean;
|
|
58
59
|
get options(): {
|
|
59
60
|
userAttributes?: import("@builder.io/sdk/dist/src/builder.class").UserAttributes | undefined;
|
|
60
61
|
url?: string | undefined;
|
package/package.json
CHANGED
|
@@ -84,6 +84,10 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
+
get isPreviewingOrEditing() {
|
|
88
|
+
return (builder.editingModel || builder.previewingModel) === this.name;
|
|
89
|
+
}
|
|
90
|
+
|
|
87
91
|
get options() {
|
|
88
92
|
let options = {
|
|
89
93
|
...(this.props.options || ({} as GetContentOptions)),
|
|
@@ -91,10 +95,13 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
|
|
|
91
95
|
if (!options.key && this.props.content?.id && !Builder.isEditing && !Builder.isPreviewing) {
|
|
92
96
|
options.key = this.props.content.id;
|
|
93
97
|
}
|
|
98
|
+
if (!options.key && this.isPreviewingOrEditing) {
|
|
99
|
+
options.key = this.name + ':data';
|
|
100
|
+
}
|
|
94
101
|
if (
|
|
95
102
|
this.props.content &&
|
|
96
103
|
!options.initialContent?.length &&
|
|
97
|
-
|
|
104
|
+
this.props.inline
|
|
98
105
|
) {
|
|
99
106
|
options.initialContent = [this.props.content];
|
|
100
107
|
}
|
|
@@ -190,17 +197,24 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
|
|
|
190
197
|
|
|
191
198
|
subscribeToContent() {
|
|
192
199
|
if (this.name !== '_inline') {
|
|
193
|
-
console.log(' here triggering subscribe with ', this.name, this.options, this.props);
|
|
194
200
|
// TODO:... using targeting...? express.request hmmm
|
|
195
201
|
this.subscriptions.add(
|
|
196
202
|
builder.queueGetContent(this.name, this.options).subscribe(
|
|
197
203
|
matches => {
|
|
198
204
|
const match = matches && matches[0];
|
|
199
|
-
console.log(' here got matches ', this.name, this.options, this.props, match);
|
|
200
205
|
this.setState({
|
|
201
206
|
data: match,
|
|
202
207
|
loading: false,
|
|
203
208
|
});
|
|
209
|
+
// // when BuilderContent is wrapping a BuilderComponent of the same model, the builderComponent is passing initialContent on on the same key
|
|
210
|
+
// // causing the sdk to resolve this call to the initialContent instead of the previewed/edited content
|
|
211
|
+
// // so we test here if the BuilderContent is being used directly ( not inlined ) and is being edited or previewed we get the content one more time
|
|
212
|
+
// const isPreviewing = (builder.editingModel || builder.previewingModel) === this.name;
|
|
213
|
+
// if (!this.props.inline && this.firstLoad && isPreviewing) {
|
|
214
|
+
// this.firstLoad = false;
|
|
215
|
+
// this.subscriptions.unsubscribe();
|
|
216
|
+
// this.subscribeToContent();
|
|
217
|
+
// }
|
|
204
218
|
|
|
205
219
|
if (match && this.firstLoad) {
|
|
206
220
|
this.firstLoad = false;
|