@builder.io/react 2.0.6-3 → 2.0.6-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.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@builder.io/react",
3
- "version": "2.0.6-2",
3
+ "version": "2.0.6-5",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "main": "dist/builder-react.cjs.js",
@@ -176,9 +176,6 @@ var BuilderContent = /** @class */ (function (_super) {
176
176
  // TODO: observe model name for changes
177
177
  BuilderContent.prototype.componentDidMount = function () {
178
178
  var _a, _b;
179
- if (sdk_1.Builder.isEditing) {
180
- addEventListener('message', this.onWindowMessage);
181
- }
182
179
  // Temporary to test metrics diving in with bigquery and heatmaps
183
180
  // this.builder.autoTrack = true;
184
181
  // this.builder.env = 'development';
@@ -194,22 +191,28 @@ var BuilderContent = /** @class */ (function (_super) {
194
191
  });
195
192
  }
196
193
  }
194
+ if (sdk_1.Builder.isEditing) {
195
+ addEventListener('message', this.onWindowMessage);
196
+ }
197
197
  /// REACT15ONLY if (this.ref) { this.ref.setAttribute('builder-model', this.name); }
198
198
  };
199
199
  BuilderContent.prototype.subscribeToContent = function () {
200
200
  var _this = this;
201
201
  if (this.name !== '_inline') {
202
- console.log(' here triggering subscribe with ', this.name, this.options, this.props);
203
202
  // TODO:... using targeting...? express.request hmmm
204
203
  this.subscriptions.add(sdk_1.builder.queueGetContent(this.name, this.options).subscribe(function (matches) {
205
204
  var match = matches && matches[0];
206
- console.log(' here got matches ', _this.name, _this.options, _this.props, match);
207
205
  _this.setState({
208
206
  data: match,
209
207
  loading: false,
210
208
  });
211
- if (!_this.props.inline && _this.firstLoad && (sdk_1.Builder.isEditing || sdk_1.Builder.isPreviewing)) {
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
+ var isPreviewing = (sdk_1.builder.editingModel || sdk_1.builder.previewingModel) === _this.name;
213
+ if (!_this.props.inline && _this.firstLoad && isPreviewing) {
212
214
  _this.firstLoad = false;
215
+ _this.subscriptions.unsubscribe();
213
216
  _this.subscribeToContent();
214
217
  }
215
218
  if (match && _this.firstLoad) {
@@ -1 +1 @@
1
- {"version":3,"file":"builder-content.component.js","sourceRoot":"","sources":["../../../../src/components/builder-content.component.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"builder-content.component.js","sourceRoot":"","sources":["../../../../src/components/builder-content.component.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@builder.io/react",
3
- "version": "2.0.6-3",
3
+ "version": "2.0.6-6",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "main": "dist/builder-react.cjs.js",
@@ -166,9 +166,6 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
166
166
 
167
167
  // TODO: observe model name for changes
168
168
  componentDidMount() {
169
- if (Builder.isEditing) {
170
- addEventListener('message', this.onWindowMessage);
171
- }
172
169
  // Temporary to test metrics diving in with bigquery and heatmaps
173
170
  // this.builder.autoTrack = true;
174
171
  // this.builder.env = 'development';
@@ -184,24 +181,31 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
184
181
  }
185
182
  }
186
183
 
184
+ if (Builder.isEditing) {
185
+ addEventListener('message', this.onWindowMessage);
186
+ }
187
+
187
188
  /// REACT15ONLY if (this.ref) { this.ref.setAttribute('builder-model', this.name); }
188
189
  }
189
190
 
190
191
  subscribeToContent() {
191
192
  if (this.name !== '_inline') {
192
- console.log(' here triggering subscribe with ', this.name, this.options, this.props);
193
193
  // TODO:... using targeting...? express.request hmmm
194
194
  this.subscriptions.add(
195
195
  builder.queueGetContent(this.name, this.options).subscribe(
196
196
  matches => {
197
197
  const match = matches && matches[0];
198
- console.log(' here got matches ', this.name, this.options, this.props, match);
199
198
  this.setState({
200
199
  data: match,
201
200
  loading: false,
202
201
  });
203
- if (!this.props.inline && this.firstLoad && (Builder.isEditing || Builder.isPreviewing)) {
202
+ // when BuilderContent is wrapping a BuilderComponent of the same model, the builderComponent is passing initialContent on on the same key
203
+ // causing the sdk to resolve this call to the initialContent instead of the previewed/edited content
204
+ // 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
205
+ const isPreviewing = (builder.editingModel || builder.previewingModel) === this.name;
206
+ if (!this.props.inline && this.firstLoad && isPreviewing) {
204
207
  this.firstLoad = false;
208
+ this.subscriptions.unsubscribe();
205
209
  this.subscribeToContent();
206
210
  }
207
211