esp-js-react 8.0.0-next.0 → 8.0.2-next.0
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/esp-react.js +132 -90
- package/.dist/esp-react.js.map +1 -1
- package/.dist/esp-react.min.js +1 -1
- package/.dist/esp-react.min.js.map +1 -1
- package/.dist/typings/{espModelContext.d.ts → espModelContextProvider.d.ts} +2 -2
- package/.dist/typings/{espRouterContext.d.ts → espRouterContextProvider.d.ts} +8 -8
- package/.dist/typings/index.d.ts +5 -5
- package/.dist/typings/polimer/getEspPolimerImmutableModel.d.ts +21 -0
- package/.dist/typings/useModelSelector.d.ts +20 -6
- package/package.json +4 -4
- package/src/connectableComponent.tsx +10 -9
- package/src/{espModelContext.tsx → espModelContextProvider.tsx} +5 -5
- package/src/{espRouterContext.tsx → espRouterContextProvider.tsx} +8 -8
- package/src/index.ts +19 -13
- package/src/polimer/getEspPolimerImmutableModel.ts +50 -0
- package/src/useModelSelector.ts +85 -20
- package/src/viewBinder.tsx +1 -1
- package/src/viewBinderConnectable.tsx +11 -10
- package/tests/connectableComponentLegacyTests.tsx +26 -26
- package/tests/connectableComponentTests.tsx +419 -0
- package/tests/indexTests.ts +25 -91
- package/tests/testApi/asserts.ts +75 -0
- package/tests/testApi/routerSpy.ts +24 -0
- package/tests/testApi/testApi.tsx +84 -0
- package/tests/testApi/testModel.ts +37 -0
- package/tests/testApi/useStoreReceivedProps.ts +11 -0
- package/tests/testApi/viewMetadata.tsx +46 -0
- package/tests/useModelSelectorTests.tsx +257 -0
- package/.dist/typings/polimer/getEspReactRenderModel.d.ts +0 -21
- package/src/polimer/getEspReactRenderModel.ts +0 -50
- package/tests/connectWithSelectorTests.tsx +0 -67
- /package/.dist/typings/polimer/{polimerExtentsions.d.ts → polimerModelBuilderExtentsions.d.ts} +0 -0
- /package/src/polimer/{polimerExtentsions.ts → polimerModelBuilderExtentsions.ts} +0 -0
package/.dist/esp-react.js
CHANGED
|
@@ -98,16 +98,16 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
98
98
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
99
99
|
exports.ConnectableComponent = void 0;
|
|
100
100
|
const React = __webpack_require__(155);
|
|
101
|
-
const
|
|
101
|
+
const espRouterContextProvider_1 = __webpack_require__(169);
|
|
102
102
|
const react_1 = __webpack_require__(155);
|
|
103
103
|
const esp_js_1 = __webpack_require__(152);
|
|
104
|
-
const
|
|
104
|
+
const espModelContextProvider_1 = __webpack_require__(963);
|
|
105
105
|
const viewBindingDecorator_1 = __webpack_require__(213);
|
|
106
|
-
const
|
|
106
|
+
const getEspPolimerImmutableModel_1 = __webpack_require__(894);
|
|
107
107
|
const useModelSelector_1 = __webpack_require__(743);
|
|
108
108
|
const getChildProps = (router, modelId, restProps, initialModel, mapModelToProps, publishEventProps) => {
|
|
109
109
|
// consume what this component owns, and let the rest end up in `...rest`
|
|
110
|
-
const model = (0,
|
|
110
|
+
const model = (0, getEspPolimerImmutableModel_1.tryGetPolimerImmutableModel)(initialModel);
|
|
111
111
|
let childProps = Object.assign(Object.assign(Object.assign({ modelId, router: router }, restProps), publishEventProps), { model });
|
|
112
112
|
if (mapModelToProps) {
|
|
113
113
|
childProps = Object.assign(Object.assign({}, childProps), mapModelToProps(model, publishEventProps));
|
|
@@ -120,8 +120,8 @@ const getChildProps = (router, modelId, restProps, initialModel, mapModelToProps
|
|
|
120
120
|
*/
|
|
121
121
|
const ConnectableComponent = (_a) => {
|
|
122
122
|
var { modelId, mapModelToProps, createPublishEventProps, view, viewContext } = _a, rest = __rest(_a, ["modelId", "mapModelToProps", "createPublishEventProps", "view", "viewContext"]);
|
|
123
|
-
const router = (0,
|
|
124
|
-
modelId = modelId || (0,
|
|
123
|
+
const router = (0, espRouterContextProvider_1.useRouter)();
|
|
124
|
+
modelId = modelId || (0, espModelContextProvider_1.useGetModelId)();
|
|
125
125
|
if (esp_js_1.utils.stringIsEmpty(modelId) || !router) {
|
|
126
126
|
return null;
|
|
127
127
|
}
|
|
@@ -134,30 +134,32 @@ const ConnectableComponent = (_a) => {
|
|
|
134
134
|
}
|
|
135
135
|
return {};
|
|
136
136
|
}, [router, modelId]);
|
|
137
|
-
const model = (0, useModelSelector_1.useModelSelector)(m => m,
|
|
137
|
+
const model = (0, useModelSelector_1.useModelSelector)(m => m, (0, useModelSelector_1.modelSelectorOptions)()
|
|
138
|
+
.setModelId(modelId)
|
|
139
|
+
.setTryPreSelectPolimerImmutableModel(false));
|
|
138
140
|
if (model == null) {
|
|
139
141
|
return null;
|
|
140
142
|
}
|
|
141
143
|
let childProps = getChildProps(router, modelId, rest, model, mapModelToProps, publishEventProps);
|
|
142
144
|
let viewElement = (0, viewBindingDecorator_1.createViewForModel)(model, childProps, viewContext, view);
|
|
143
|
-
return (React.createElement(
|
|
145
|
+
return (React.createElement(espModelContextProvider_1.EspModelContextProvider, Object.assign({ modelId: modelId, model: model, router: router }, childProps), viewElement));
|
|
144
146
|
};
|
|
145
147
|
exports.ConnectableComponent = ConnectableComponent;
|
|
146
148
|
|
|
147
149
|
|
|
148
150
|
/***/ }),
|
|
149
151
|
|
|
150
|
-
/***/
|
|
152
|
+
/***/ 963:
|
|
151
153
|
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
|
|
152
154
|
|
|
153
155
|
|
|
154
156
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
155
|
-
exports.
|
|
157
|
+
exports.EspModelContextProvider = exports.usePublishModelEventWithEntityKey = exports.PublishModelEventWithEntityKeyContext = exports.usePublishModelEvent = exports.PublishModelEventContext = exports.useGetModel = exports.GetModelContext = exports.useGetModelId = exports.GetModelIdContext = void 0;
|
|
156
158
|
const React = __webpack_require__(155);
|
|
157
159
|
const esp_js_1 = __webpack_require__(152);
|
|
158
160
|
const react_1 = __webpack_require__(155);
|
|
159
|
-
const
|
|
160
|
-
const _log = esp_js_1.Logger.create('
|
|
161
|
+
const espRouterContextProvider_1 = __webpack_require__(169);
|
|
162
|
+
const _log = esp_js_1.Logger.create('EspModelContextProvider');
|
|
161
163
|
exports.GetModelIdContext = (0, react_1.createContext)(null);
|
|
162
164
|
/**
|
|
163
165
|
* Returns a function which will return the ID of the model currently being rendered.
|
|
@@ -186,8 +188,8 @@ exports.PublishModelEventWithEntityKeyContext = (0, react_1.createContext)(null)
|
|
|
186
188
|
*/
|
|
187
189
|
const usePublishModelEventWithEntityKey = () => (0, react_1.useContext)(exports.PublishModelEventWithEntityKeyContext);
|
|
188
190
|
exports.usePublishModelEventWithEntityKey = usePublishModelEventWithEntityKey;
|
|
189
|
-
const
|
|
190
|
-
const router = (0,
|
|
191
|
+
const EspModelContextProvider = ({ modelId, children, model }) => {
|
|
192
|
+
const router = (0, espRouterContextProvider_1.useRouter)();
|
|
191
193
|
const getModelId = (0, react_1.useCallback)(() => {
|
|
192
194
|
return modelId;
|
|
193
195
|
}, [router, modelId]);
|
|
@@ -206,7 +208,7 @@ const EspModelContext = ({ modelId, children, model }) => {
|
|
|
206
208
|
React.createElement(exports.PublishModelEventWithEntityKeyContext.Provider, { value: publishModelEventWithEntityKey },
|
|
207
209
|
React.createElement(exports.GetModelContext.Provider, { value: getModel }, children)))));
|
|
208
210
|
};
|
|
209
|
-
exports.
|
|
211
|
+
exports.EspModelContextProvider = EspModelContextProvider;
|
|
210
212
|
const warnIfModelAccessedOutSideDispatchLoop = (router, modelId) => {
|
|
211
213
|
if (true) {
|
|
212
214
|
return;
|
|
@@ -224,7 +226,7 @@ const warnIfModelAccessedOutSideDispatchLoop = (router, modelId) => {
|
|
|
224
226
|
catch (e) {
|
|
225
227
|
stack = e.stack;
|
|
226
228
|
}
|
|
227
|
-
_log.warn(`
|
|
229
|
+
_log.warn(`EspModelContextProvider useGetModelId has been invoked outside of the models (${modelId}) dispatch loop.` +
|
|
228
230
|
`This may have unknown state state issues.` +
|
|
229
231
|
stack);
|
|
230
232
|
}
|
|
@@ -233,7 +235,7 @@ const warnIfModelAccessedOutSideDispatchLoop = (router, modelId) => {
|
|
|
233
235
|
|
|
234
236
|
/***/ }),
|
|
235
237
|
|
|
236
|
-
/***/
|
|
238
|
+
/***/ 169:
|
|
237
239
|
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
|
|
238
240
|
|
|
239
241
|
|
|
@@ -255,7 +257,7 @@ const warnIfModelAccessedOutSideDispatchLoop = (router, modelId) => {
|
|
|
255
257
|
*/
|
|
256
258
|
// notice_end
|
|
257
259
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
258
|
-
exports.RouterProvider = exports.
|
|
260
|
+
exports.RouterProvider = exports.EspRouterContextProvider = exports.usePublishEvent = exports.PublishEventContext = exports.useRouter = exports.RouterContext = void 0;
|
|
259
261
|
const React = __webpack_require__(155);
|
|
260
262
|
const react_1 = __webpack_require__(155);
|
|
261
263
|
exports.RouterContext = (0, react_1.createContext)(null);
|
|
@@ -282,9 +284,9 @@ exports.PublishEventContext = (0, react_1.createContext)(null);
|
|
|
282
284
|
*
|
|
283
285
|
* To use this, please ensure your V-DOM has the EspRouterContext at a higher node:
|
|
284
286
|
*
|
|
285
|
-
* <
|
|
287
|
+
* <EspRouterContextProvider router={router}>
|
|
286
288
|
* <YourComponents />
|
|
287
|
-
* </
|
|
289
|
+
* </EspRouterContextProvider>
|
|
288
290
|
*/
|
|
289
291
|
const usePublishEvent = () => (0, react_1.useContext)(exports.PublishEventContext);
|
|
290
292
|
exports.usePublishEvent = usePublishEvent;
|
|
@@ -293,78 +295,78 @@ exports.usePublishEvent = usePublishEvent;
|
|
|
293
295
|
*
|
|
294
296
|
* Also sets up the usePublishEvent() hook so nested components can publish to the router.
|
|
295
297
|
*/
|
|
296
|
-
const
|
|
298
|
+
const EspRouterContextProvider = ({ children, router }) => {
|
|
297
299
|
const publishEvent = (0, react_1.useCallback)((modelIdOrModelAddress, eventType, event) => {
|
|
298
300
|
router.publishEvent(modelIdOrModelAddress, eventType, event);
|
|
299
301
|
}, [router]);
|
|
300
302
|
return (React.createElement(exports.RouterContext.Provider, { value: router },
|
|
301
303
|
React.createElement(exports.PublishEventContext.Provider, { value: publishEvent }, children)));
|
|
302
304
|
};
|
|
303
|
-
exports.
|
|
305
|
+
exports.EspRouterContextProvider = EspRouterContextProvider;
|
|
304
306
|
/**
|
|
305
307
|
* Used to set the router on the RouterContext making it available to components down the tree (via useRouter()).
|
|
306
308
|
*
|
|
307
|
-
* @deprecated use
|
|
309
|
+
* @deprecated use EspRouterContextProvider
|
|
308
310
|
*/
|
|
309
|
-
exports.RouterProvider = exports.
|
|
311
|
+
exports.RouterProvider = exports.EspRouterContextProvider;
|
|
310
312
|
|
|
311
313
|
|
|
312
314
|
/***/ }),
|
|
313
315
|
|
|
314
|
-
/***/
|
|
316
|
+
/***/ 894:
|
|
315
317
|
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
|
|
316
318
|
|
|
317
319
|
|
|
318
320
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
319
|
-
exports.
|
|
320
|
-
exports.
|
|
321
|
+
exports.tryGetPolimerImmutableModel = exports.GetEspPolimerImmutableModelConsts = void 0;
|
|
322
|
+
exports.getEspPolimerImmutableModel = getEspPolimerImmutableModel;
|
|
321
323
|
const esp_js_1 = __webpack_require__(152);
|
|
322
|
-
var
|
|
323
|
-
(function (
|
|
324
|
-
|
|
324
|
+
var GetEspPolimerImmutableModelConsts;
|
|
325
|
+
(function (GetEspPolimerImmutableModelConsts) {
|
|
326
|
+
GetEspPolimerImmutableModelConsts.CustomDataKey = 'GetEspReactImmutableModelCustomDataKey';
|
|
325
327
|
/**
|
|
326
|
-
* If there is no @
|
|
328
|
+
* If there is no @getEspPolimerImmutableModel decorator and a function by this name exists on a model, then it will be invoked to identify the sub model which will replaced the `model` prop passed to the child view of a ConnectableComponent
|
|
327
329
|
*/
|
|
328
|
-
|
|
329
|
-
})(
|
|
330
|
+
GetEspPolimerImmutableModelConsts.HandlerFunctionName = 'getEspPolimerImmutableModel';
|
|
331
|
+
})(GetEspPolimerImmutableModelConsts || (exports.GetEspPolimerImmutableModelConsts = GetEspPolimerImmutableModelConsts = {}));
|
|
330
332
|
/**
|
|
331
333
|
* A decorator which can be used to identify the render model which will replaced the `model` prop passed to the child view of a ConnectableComponent
|
|
332
334
|
*/
|
|
333
|
-
function
|
|
335
|
+
function getEspPolimerImmutableModel() {
|
|
334
336
|
return function (target, name, descriptor) {
|
|
335
337
|
let metadata = esp_js_1.EspDecoratorUtil.getOrCreateMetaData(target.constructor);
|
|
336
|
-
metadata.addCustomData(
|
|
338
|
+
metadata.addCustomData(GetEspPolimerImmutableModelConsts.CustomDataKey, { functionName: name });
|
|
337
339
|
return descriptor;
|
|
338
340
|
};
|
|
339
341
|
}
|
|
340
342
|
/**
|
|
341
343
|
* Returns the model which will be used to pluck state/props for the current view.
|
|
342
344
|
*
|
|
343
|
-
* This is basically a hook (not a React 'hook') to call a function on `model` and get a new
|
|
345
|
+
* This is basically a hook (not a React 'hook') to call a function on `model` and get a new subgraph to use as state.
|
|
344
346
|
*
|
|
345
347
|
*/
|
|
346
|
-
const
|
|
348
|
+
const tryGetPolimerImmutableModel = (model) => {
|
|
347
349
|
// does the given model have a decorated function we can invoke to get a different model to render?
|
|
348
350
|
if (esp_js_1.EspDecoratorUtil.hasMetadata(model)) {
|
|
349
|
-
let metadata = esp_js_1.EspDecoratorUtil.getCustomData(model,
|
|
351
|
+
let metadata = esp_js_1.EspDecoratorUtil.getCustomData(model, GetEspPolimerImmutableModelConsts.CustomDataKey);
|
|
350
352
|
if (metadata) {
|
|
351
353
|
return model[metadata.functionName]();
|
|
352
354
|
}
|
|
353
355
|
}
|
|
354
|
-
// else see if there is a function with name
|
|
355
|
-
let
|
|
356
|
-
if (
|
|
357
|
-
return
|
|
356
|
+
// else see if there is a function with name GetEspPolimerImmutableModelConsts.HandlerFunctionName we can invoke to get a different model to render?
|
|
357
|
+
let immutableModel = model[GetEspPolimerImmutableModelConsts.HandlerFunctionName];
|
|
358
|
+
if (immutableModel && esp_js_1.utils.isFunction(immutableModel)) {
|
|
359
|
+
return immutableModel.call(model);
|
|
358
360
|
}
|
|
359
361
|
// else return the initial model passed in
|
|
360
362
|
return model;
|
|
361
363
|
};
|
|
362
|
-
exports.
|
|
364
|
+
exports.tryGetPolimerImmutableModel = tryGetPolimerImmutableModel;
|
|
363
365
|
|
|
364
366
|
|
|
365
367
|
/***/ }),
|
|
366
368
|
|
|
367
|
-
/***/
|
|
369
|
+
/***/ 185:
|
|
368
370
|
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
|
|
369
371
|
|
|
370
372
|
|
|
@@ -402,29 +404,56 @@ esp_js_polimer_1.PolimerModelBuilder.prototype.registerWithRouter = function ()
|
|
|
402
404
|
|
|
403
405
|
|
|
404
406
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
405
|
-
exports.useModelSelector = exports.
|
|
407
|
+
exports.useModelSelector = exports.modelSelectorOptions = void 0;
|
|
406
408
|
const react_1 = __webpack_require__(155);
|
|
407
409
|
const with_selector_1 = __webpack_require__(614);
|
|
408
410
|
const esp_js_1 = __webpack_require__(152);
|
|
409
|
-
const
|
|
410
|
-
const
|
|
411
|
-
const
|
|
412
|
-
const
|
|
413
|
-
|
|
411
|
+
const espRouterContextProvider_1 = __webpack_require__(169);
|
|
412
|
+
const espModelContextProvider_1 = __webpack_require__(963);
|
|
413
|
+
const getEspPolimerImmutableModel_1 = __webpack_require__(894);
|
|
414
|
+
const modelSelectorOptions = () => {
|
|
415
|
+
let modelId = undefined;
|
|
416
|
+
let equalityFn = (a, b) => a === b;
|
|
417
|
+
let tryPreSelectPolimerImmutableModel = true;
|
|
418
|
+
return {
|
|
419
|
+
get modelId() {
|
|
420
|
+
return modelId;
|
|
421
|
+
},
|
|
422
|
+
setModelId(value) {
|
|
423
|
+
modelId = value;
|
|
424
|
+
return this;
|
|
425
|
+
},
|
|
426
|
+
get equalityFn() {
|
|
427
|
+
return equalityFn;
|
|
428
|
+
},
|
|
429
|
+
setEqualityFn(value) {
|
|
430
|
+
equalityFn = value;
|
|
431
|
+
return this;
|
|
432
|
+
},
|
|
433
|
+
get tryPreSelectPolimerImmutableModel() {
|
|
434
|
+
return tryPreSelectPolimerImmutableModel;
|
|
435
|
+
},
|
|
436
|
+
setTryPreSelectPolimerImmutableModel(value) {
|
|
437
|
+
tryPreSelectPolimerImmutableModel = value;
|
|
438
|
+
return this;
|
|
439
|
+
}
|
|
440
|
+
};
|
|
441
|
+
};
|
|
442
|
+
exports.modelSelectorOptions = modelSelectorOptions;
|
|
414
443
|
/**
|
|
415
444
|
* A hook which returns model state from the esp Router.
|
|
416
445
|
*
|
|
417
446
|
* This hooks wih observe updates and re-render the component if the model changes.
|
|
418
447
|
*
|
|
419
448
|
* @param selector - a function to select a selection of the model - the selector does not need to be memoized, this selector will be cached against the modelId.
|
|
420
|
-
* @param
|
|
421
|
-
* @param tryPreSelectPolimerImmutableModel - if true, and the esp model is an esp-js-polimer model, the immutable model will be used when calling the selector.
|
|
422
|
-
* @param equalityFn - Equality function which will be applied against TSelected, defaults to instance equality (a === b).
|
|
449
|
+
* @param options
|
|
423
450
|
*/
|
|
424
|
-
const useModelSelector = (selector,
|
|
451
|
+
const useModelSelector = (selector, options = (0, exports.modelSelectorOptions)()) => {
|
|
425
452
|
esp_js_1.Guard.isFunction(selector, 'You must pass a selector function to connectSelector');
|
|
426
|
-
const router = (0,
|
|
427
|
-
modelId = modelId || (0,
|
|
453
|
+
const router = (0, espRouterContextProvider_1.useRouter)();
|
|
454
|
+
const modelId = (options === null || options === void 0 ? void 0 : options.modelId) || (0, espModelContextProvider_1.useGetModelId)();
|
|
455
|
+
const tryPreSelectPolimerImmutableModel = options === null || options === void 0 ? void 0 : options.tryPreSelectPolimerImmutableModel;
|
|
456
|
+
const equalityFn = options === null || options === void 0 ? void 0 : options.equalityFn;
|
|
428
457
|
const dependencies = (0, react_1.useMemo)(() => {
|
|
429
458
|
// Because of how useSyncExternalStore works, there is an implicit dependency between the subscribe and getSnapshot functions.
|
|
430
459
|
// When the subscription receives the new state from the Router, it can't pass this directly onto getSnapshot, React calls that when it deems it needs to.
|
|
@@ -439,7 +468,7 @@ const useModelSelector = (selector, modelId, tryPreSelectPolimerImmutableModel =
|
|
|
439
468
|
.subscribe((m) => {
|
|
440
469
|
// try and get a submodel to render
|
|
441
470
|
const nextModel = tryPreSelectPolimerImmutableModel
|
|
442
|
-
? (0,
|
|
471
|
+
? (0, getEspPolimerImmutableModel_1.tryGetPolimerImmutableModel)(m)
|
|
443
472
|
: m;
|
|
444
473
|
// if the above didn't manage to get a submodel,
|
|
445
474
|
// we need to mutate to force useSyncExternalStoreWithSelector to pick up the change
|
|
@@ -458,8 +487,7 @@ const useModelSelector = (selector, modelId, tryPreSelectPolimerImmutableModel =
|
|
|
458
487
|
return model;
|
|
459
488
|
},
|
|
460
489
|
// While getSnapshot needs to model to be immutable,
|
|
461
|
-
//
|
|
462
|
-
// useSyncExternalStoreWithSelector builds on top of this so the TSelected can defer to an equality check to determine if the change is propagated.
|
|
490
|
+
// useSyncExternalStoreWithSelector builds on top of this, so the TSelected can defer to an equality check to determine if the change is propagated.
|
|
463
491
|
// The selector here just maps the TSelected, useSyncExternalStoreWithSelector internally does the equality check.
|
|
464
492
|
wrappedSelector: (snapshot) => {
|
|
465
493
|
// The first time this renders, react calls getSnapshot and the selector before the router has pushed a change.
|
|
@@ -472,12 +500,22 @@ const useModelSelector = (selector, modelId, tryPreSelectPolimerImmutableModel =
|
|
|
472
500
|
},
|
|
473
501
|
// Don't cache check against 'selector' argument as that will likely change unless the caller memoizes it.
|
|
474
502
|
[router, modelId]);
|
|
503
|
+
// If we don't have a modelId, we still need to return a hook so React doesn't complain.
|
|
504
|
+
// Additionally, we need to let the above expiration (dependencies) run to unsubscribe from any previous subscription.
|
|
505
|
+
if (esp_js_1.utils.stringIsEmpty(modelId)) {
|
|
506
|
+
return (0, with_selector_1.useSyncExternalStoreWithSelector)(noopSubscription.subscribe, noopSubscription.getSnapshot, undefined, noopSubscription.wrappedSelector, equalityFn);
|
|
507
|
+
}
|
|
475
508
|
// Docs on useSyncExternalStore https://github.com/reactwg/react-18/discussions/86
|
|
476
509
|
// Redux's usage of this: https://github.com/reduxjs/react-redux/blob/master/src/hooks/useSelector.ts
|
|
477
510
|
// Code: https://github.com/facebook/react/blob/main/packages/use-sync-external-store/src/useSyncExternalStoreWithSelector.js
|
|
478
511
|
return (0, with_selector_1.useSyncExternalStoreWithSelector)(dependencies.subscribe, dependencies.getSnapshot, undefined, dependencies.wrappedSelector, equalityFn);
|
|
479
512
|
};
|
|
480
513
|
exports.useModelSelector = useModelSelector;
|
|
514
|
+
const noopSubscription = {
|
|
515
|
+
subscribe: () => { },
|
|
516
|
+
getSnapshot: () => null,
|
|
517
|
+
wrappedSelector: () => true
|
|
518
|
+
};
|
|
481
519
|
|
|
482
520
|
|
|
483
521
|
/***/ }),
|
|
@@ -517,11 +555,11 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
517
555
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
518
556
|
exports.ViewBinder = void 0;
|
|
519
557
|
const viewBindingDecorator_1 = __webpack_require__(213);
|
|
520
|
-
const
|
|
558
|
+
const espRouterContextProvider_1 = __webpack_require__(169);
|
|
521
559
|
const ViewBinder = (_a) => {
|
|
522
560
|
var { model, viewContext } = _a, rest = __rest(_a, ["model", "viewContext"]);
|
|
523
561
|
if (model) {
|
|
524
|
-
const router = (0,
|
|
562
|
+
const router = (0, espRouterContextProvider_1.useRouter)();
|
|
525
563
|
const newProps = Object.assign({}, { model, router }, rest);
|
|
526
564
|
return (0, viewBindingDecorator_1.createViewForModel)(model, newProps, viewContext, null);
|
|
527
565
|
}
|
|
@@ -538,13 +576,13 @@ exports.ViewBinder = ViewBinder;
|
|
|
538
576
|
|
|
539
577
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
540
578
|
exports.ViewBinderConnectable = void 0;
|
|
541
|
-
const
|
|
542
|
-
const
|
|
579
|
+
const espRouterContextProvider_1 = __webpack_require__(169);
|
|
580
|
+
const espModelContextProvider_1 = __webpack_require__(963);
|
|
543
581
|
const esp_js_1 = __webpack_require__(152);
|
|
544
582
|
const React = __webpack_require__(155);
|
|
545
583
|
const useModelSelector_1 = __webpack_require__(743);
|
|
546
584
|
const viewBindingDecorator_1 = __webpack_require__(213);
|
|
547
|
-
const
|
|
585
|
+
const getEspPolimerImmutableModel_1 = __webpack_require__(894);
|
|
548
586
|
const _log = esp_js_1.Logger.create('ViewBinderConnectable');
|
|
549
587
|
/**
|
|
550
588
|
* Dynamically binds a view found via @viewBinder(SomeJsXView) to a model managed by the Router.
|
|
@@ -555,19 +593,21 @@ const _log = esp_js_1.Logger.create('ViewBinderConnectable');
|
|
|
555
593
|
* @constructor
|
|
556
594
|
*/
|
|
557
595
|
const ViewBinderConnectable = ({ modelId, viewContext, view }) => {
|
|
558
|
-
const router = (0,
|
|
559
|
-
const model = (0, useModelSelector_1.useModelSelector)(m => m,
|
|
596
|
+
const router = (0, espRouterContextProvider_1.useRouter)();
|
|
597
|
+
const model = (0, useModelSelector_1.useModelSelector)(m => m, (0, useModelSelector_1.modelSelectorOptions)()
|
|
598
|
+
.setModelId(modelId)
|
|
599
|
+
.setTryPreSelectPolimerImmutableModel(false));
|
|
560
600
|
if (!model) {
|
|
561
601
|
return null;
|
|
562
602
|
}
|
|
563
|
-
let
|
|
603
|
+
let immutableModel = (0, getEspPolimerImmutableModel_1.tryGetPolimerImmutableModel)(model);
|
|
564
604
|
const childProps = {
|
|
565
605
|
modelId,
|
|
566
606
|
router: router,
|
|
567
|
-
model:
|
|
607
|
+
model: immutableModel
|
|
568
608
|
};
|
|
569
609
|
let viewElement = (0, viewBindingDecorator_1.createViewForModel)(model, childProps, viewContext, view);
|
|
570
|
-
return (React.createElement(
|
|
610
|
+
return (React.createElement(espModelContextProvider_1.EspModelContextProvider, Object.assign({ modelId: modelId, router: router, model: immutableModel }, childProps), viewElement));
|
|
571
611
|
};
|
|
572
612
|
exports.ViewBinderConnectable = ViewBinderConnectable;
|
|
573
613
|
|
|
@@ -763,9 +803,9 @@ var exports = __webpack_exports__;
|
|
|
763
803
|
// notice_end
|
|
764
804
|
//
|
|
765
805
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
766
|
-
exports.
|
|
806
|
+
exports.EspModelContextProvider = exports.usePublishModelEventWithEntityKey = exports.PublishModelEventWithEntityKeyContext = exports.usePublishModelEvent = exports.PublishModelEventContext = exports.GetModelContext = exports.useGetModel = exports.GetModelIdContext = exports.useGetModelId = exports.usePublishEvent = exports.PublishEventContext = exports.useRouter = exports.RouterContext = exports.EspRouterContextProvider = exports.RouterProvider = exports.modelSelectorOptions = exports.useModelSelector = exports.ConnectableComponent = exports.connect = exports.createViewForModel = exports.getEspPolimerImmutableModel = exports.GetEspPolimerImmutableModelConsts = exports.DEFAULT_VIEW_KEY = exports.viewBinding = exports.ViewBinderConnectable = exports.ViewBinder = void 0;
|
|
767
807
|
// import for side effects
|
|
768
|
-
__webpack_require__(
|
|
808
|
+
__webpack_require__(185);
|
|
769
809
|
var viewBinder_1 = __webpack_require__(453);
|
|
770
810
|
Object.defineProperty(exports, "ViewBinder", ({ enumerable: true, get: function () { return viewBinder_1.ViewBinder; } }));
|
|
771
811
|
var viewBinderConnectable_1 = __webpack_require__(639);
|
|
@@ -773,9 +813,9 @@ Object.defineProperty(exports, "ViewBinderConnectable", ({ enumerable: true, get
|
|
|
773
813
|
var viewBindingDecorator_1 = __webpack_require__(213);
|
|
774
814
|
Object.defineProperty(exports, "viewBinding", ({ enumerable: true, get: function () { return viewBindingDecorator_1.viewBinding; } }));
|
|
775
815
|
Object.defineProperty(exports, "DEFAULT_VIEW_KEY", ({ enumerable: true, get: function () { return viewBindingDecorator_1.DEFAULT_VIEW_KEY; } }));
|
|
776
|
-
var
|
|
777
|
-
Object.defineProperty(exports, "
|
|
778
|
-
Object.defineProperty(exports, "
|
|
816
|
+
var getEspPolimerImmutableModel_1 = __webpack_require__(894);
|
|
817
|
+
Object.defineProperty(exports, "GetEspPolimerImmutableModelConsts", ({ enumerable: true, get: function () { return getEspPolimerImmutableModel_1.GetEspPolimerImmutableModelConsts; } }));
|
|
818
|
+
Object.defineProperty(exports, "getEspPolimerImmutableModel", ({ enumerable: true, get: function () { return getEspPolimerImmutableModel_1.getEspPolimerImmutableModel; } }));
|
|
779
819
|
var viewBindingDecorator_2 = __webpack_require__(213);
|
|
780
820
|
Object.defineProperty(exports, "createViewForModel", ({ enumerable: true, get: function () { return viewBindingDecorator_2.createViewForModel; } }));
|
|
781
821
|
var connect_1 = __webpack_require__(746);
|
|
@@ -784,22 +824,24 @@ var connectableComponent_1 = __webpack_require__(397);
|
|
|
784
824
|
Object.defineProperty(exports, "ConnectableComponent", ({ enumerable: true, get: function () { return connectableComponent_1.ConnectableComponent; } }));
|
|
785
825
|
var useModelSelector_1 = __webpack_require__(743);
|
|
786
826
|
Object.defineProperty(exports, "useModelSelector", ({ enumerable: true, get: function () { return useModelSelector_1.useModelSelector; } }));
|
|
787
|
-
Object.defineProperty(exports, "
|
|
788
|
-
var
|
|
789
|
-
Object.defineProperty(exports, "RouterProvider", ({ enumerable: true, get: function () { return
|
|
790
|
-
Object.defineProperty(exports, "
|
|
791
|
-
Object.defineProperty(exports, "RouterContext", ({ enumerable: true, get: function () { return
|
|
792
|
-
Object.defineProperty(exports, "useRouter", ({ enumerable: true, get: function () { return
|
|
793
|
-
Object.defineProperty(exports, "PublishEventContext", ({ enumerable: true, get: function () { return
|
|
794
|
-
Object.defineProperty(exports, "usePublishEvent", ({ enumerable: true, get: function () { return
|
|
795
|
-
var
|
|
796
|
-
Object.defineProperty(exports, "useGetModelId", ({ enumerable: true, get: function () { return
|
|
797
|
-
Object.defineProperty(exports, "GetModelIdContext", ({ enumerable: true, get: function () { return
|
|
798
|
-
Object.defineProperty(exports, "
|
|
799
|
-
Object.defineProperty(exports, "
|
|
800
|
-
Object.defineProperty(exports, "
|
|
801
|
-
Object.defineProperty(exports, "
|
|
802
|
-
Object.defineProperty(exports, "
|
|
827
|
+
Object.defineProperty(exports, "modelSelectorOptions", ({ enumerable: true, get: function () { return useModelSelector_1.modelSelectorOptions; } }));
|
|
828
|
+
var espRouterContextProvider_1 = __webpack_require__(169);
|
|
829
|
+
Object.defineProperty(exports, "RouterProvider", ({ enumerable: true, get: function () { return espRouterContextProvider_1.RouterProvider; } }));
|
|
830
|
+
Object.defineProperty(exports, "EspRouterContextProvider", ({ enumerable: true, get: function () { return espRouterContextProvider_1.EspRouterContextProvider; } }));
|
|
831
|
+
Object.defineProperty(exports, "RouterContext", ({ enumerable: true, get: function () { return espRouterContextProvider_1.RouterContext; } }));
|
|
832
|
+
Object.defineProperty(exports, "useRouter", ({ enumerable: true, get: function () { return espRouterContextProvider_1.useRouter; } }));
|
|
833
|
+
Object.defineProperty(exports, "PublishEventContext", ({ enumerable: true, get: function () { return espRouterContextProvider_1.PublishEventContext; } }));
|
|
834
|
+
Object.defineProperty(exports, "usePublishEvent", ({ enumerable: true, get: function () { return espRouterContextProvider_1.usePublishEvent; } }));
|
|
835
|
+
var espModelContextProvider_1 = __webpack_require__(963);
|
|
836
|
+
Object.defineProperty(exports, "useGetModelId", ({ enumerable: true, get: function () { return espModelContextProvider_1.useGetModelId; } }));
|
|
837
|
+
Object.defineProperty(exports, "GetModelIdContext", ({ enumerable: true, get: function () { return espModelContextProvider_1.GetModelIdContext; } }));
|
|
838
|
+
Object.defineProperty(exports, "useGetModel", ({ enumerable: true, get: function () { return espModelContextProvider_1.useGetModel; } }));
|
|
839
|
+
Object.defineProperty(exports, "GetModelContext", ({ enumerable: true, get: function () { return espModelContextProvider_1.GetModelContext; } }));
|
|
840
|
+
Object.defineProperty(exports, "PublishModelEventContext", ({ enumerable: true, get: function () { return espModelContextProvider_1.PublishModelEventContext; } }));
|
|
841
|
+
Object.defineProperty(exports, "usePublishModelEvent", ({ enumerable: true, get: function () { return espModelContextProvider_1.usePublishModelEvent; } }));
|
|
842
|
+
Object.defineProperty(exports, "PublishModelEventWithEntityKeyContext", ({ enumerable: true, get: function () { return espModelContextProvider_1.PublishModelEventWithEntityKeyContext; } }));
|
|
843
|
+
Object.defineProperty(exports, "usePublishModelEventWithEntityKey", ({ enumerable: true, get: function () { return espModelContextProvider_1.usePublishModelEventWithEntityKey; } }));
|
|
844
|
+
Object.defineProperty(exports, "EspModelContextProvider", ({ enumerable: true, get: function () { return espModelContextProvider_1.EspModelContextProvider; } }));
|
|
803
845
|
|
|
804
846
|
})();
|
|
805
847
|
|