esp-js-react 8.0.5-next.0 → 8.0.6-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 +62 -72
- 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/index.d.ts +0 -1
- package/.dist/typings/polimer/getEspPolimerImmutableModel.d.ts +3 -15
- package/.dist/typings/useSyncModelWithSelector.d.ts +2 -0
- package/.yarnignore +0 -1
- package/package.json +4 -4
- package/src/connectableComponent.tsx +4 -2
- package/src/index.ts +0 -5
- package/src/polimer/getEspPolimerImmutableModel.ts +13 -38
- package/src/useSyncModelWithSelector.ts +51 -36
- package/tests/connectableComponentTests.tsx +37 -56
- package/tests/indexTests.ts +0 -2
- package/tests/testApi/testModel.ts +2 -2
|
@@ -5,55 +5,66 @@ import {
|
|
|
5
5
|
connect,
|
|
6
6
|
ConnectableComponent,
|
|
7
7
|
ConnectableComponentProps,
|
|
8
|
-
getEspPolimerImmutableModel,
|
|
9
8
|
PublishModelEventDelegate,
|
|
10
9
|
viewBinding,
|
|
11
10
|
MapModelToProps,
|
|
12
11
|
CreatePublishEventProps,
|
|
13
|
-
GetEspPolimerImmutableModelConsts,
|
|
14
12
|
} from '../src';
|
|
15
13
|
import {testApi, TestApi} from './testApi/testApi';
|
|
16
14
|
import {observeEvent} from 'esp-js';
|
|
17
15
|
import {viewFactory} from './testApi/viewFactory';
|
|
16
|
+
import {GetEspPolimerImmutableModelFunctionName} from '../src/polimer/getEspPolimerImmutableModel';
|
|
18
17
|
|
|
19
|
-
interface
|
|
18
|
+
interface TestModelState {
|
|
20
19
|
value: string;
|
|
21
20
|
value2: string;
|
|
22
21
|
value3: string;
|
|
22
|
+
foo: string;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
@viewBinding(viewFactory('View1'))
|
|
26
26
|
@viewBinding(viewFactory('View3'), 'alternative-view-context')
|
|
27
27
|
class TestModel {
|
|
28
|
-
|
|
28
|
+
protected _state: TestModelState = {
|
|
29
|
+
value: 'initial-value',
|
|
30
|
+
value2: undefined,
|
|
31
|
+
value3: undefined,
|
|
32
|
+
foo: undefined
|
|
33
|
+
};
|
|
29
34
|
|
|
30
|
-
|
|
31
|
-
this.value
|
|
35
|
+
public get value(): string {
|
|
36
|
+
return this._state.value;
|
|
32
37
|
}
|
|
33
38
|
|
|
34
39
|
@observeEvent('test-event')
|
|
35
40
|
_onTestEvent(ev: string) {
|
|
36
|
-
this.
|
|
41
|
+
this._updateState({
|
|
42
|
+
value: ev
|
|
43
|
+
});
|
|
37
44
|
}
|
|
38
|
-
}
|
|
39
45
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
value2: this.value,
|
|
46
|
-
value3: 'value-3'
|
|
47
|
-
} as MappedModel;
|
|
46
|
+
protected _updateState = (partialState: Partial<TestModelState>) => {
|
|
47
|
+
this._state = {
|
|
48
|
+
...this._state,
|
|
49
|
+
...partialState
|
|
50
|
+
};
|
|
48
51
|
}
|
|
49
52
|
}
|
|
50
53
|
|
|
51
|
-
class
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
54
|
+
class TestModel2 extends TestModel {
|
|
55
|
+
|
|
56
|
+
constructor() {
|
|
57
|
+
super();
|
|
58
|
+
this._updateState({
|
|
59
|
+
value: this._state.value,
|
|
60
|
+
value2: this._state.value,
|
|
61
|
+
value3: 'value-3',
|
|
55
62
|
foo: 'the-foo'
|
|
56
|
-
};
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
[GetEspPolimerImmutableModelFunctionName] = () => {
|
|
67
|
+
return this._state;
|
|
57
68
|
};
|
|
58
69
|
}
|
|
59
70
|
|
|
@@ -71,17 +82,14 @@ interface ConnectedComponentElementCreationProperties {
|
|
|
71
82
|
describe('ConnectableComponentTests', () => {
|
|
72
83
|
let api: TestApi,
|
|
73
84
|
testModel: TestModel,
|
|
74
|
-
testModel2: TestModel2
|
|
75
|
-
testModel3: TestModel3;
|
|
85
|
+
testModel2: TestModel2;
|
|
76
86
|
|
|
77
87
|
beforeEach(() => {
|
|
78
88
|
api = testApi();
|
|
79
89
|
testModel = new TestModel();
|
|
80
90
|
testModel2 = new TestModel2();
|
|
81
|
-
testModel3 = new TestModel3();
|
|
82
91
|
api.setupModel('model-id1', testModel);
|
|
83
92
|
api.setupModel('model-id2', testModel2);
|
|
84
|
-
api.setupModel('model-id3', testModel3);
|
|
85
93
|
});
|
|
86
94
|
|
|
87
95
|
const createConnectedComponentElement = (options: ConnectedComponentElementCreationProperties): React.JSX.Element => {
|
|
@@ -101,7 +109,7 @@ describe('ConnectableComponentTests', () => {
|
|
|
101
109
|
let publishEventProps: { publishEvent1: () => void };
|
|
102
110
|
let userAlternativeViewContext: string;
|
|
103
111
|
if (options.useMapModelToProps) {
|
|
104
|
-
mapModelToProps = (model: TestModel |
|
|
112
|
+
mapModelToProps = (model: TestModel | TestModelState, publishEventProps2: any) => {
|
|
105
113
|
return {
|
|
106
114
|
foo: model.value,
|
|
107
115
|
publishEventPropsPassedMapModelToProps: publishEventProps2 && typeof publishEventProps2.publishEvent1 === 'function',
|
|
@@ -378,7 +386,6 @@ describe('ConnectableComponentTests', () => {
|
|
|
378
386
|
2,
|
|
379
387
|
props => {
|
|
380
388
|
expect(props.model.value).toBe('the-event-value2');
|
|
381
|
-
expect(props.foo).toBe('the-event-value2');
|
|
382
389
|
}
|
|
383
390
|
);
|
|
384
391
|
});
|
|
@@ -430,7 +437,7 @@ describe('ConnectableComponentTests', () => {
|
|
|
430
437
|
});
|
|
431
438
|
|
|
432
439
|
it('can pass view via prop', () => {
|
|
433
|
-
const View = viewFactory('MyPropView')
|
|
440
|
+
const View = viewFactory('MyPropView');
|
|
434
441
|
api.doRender(
|
|
435
442
|
(
|
|
436
443
|
<ConnectableComponent view={View} />
|
|
@@ -442,38 +449,12 @@ describe('ConnectableComponentTests', () => {
|
|
|
442
449
|
});
|
|
443
450
|
|
|
444
451
|
describe('Overriding model/state selector with @getEspPolimerImmutableModel', () => {
|
|
445
|
-
it('The model returned by the function decorated with a @getEspPolimerImmutableModel decorator is passed to useMapModelToProps', () => {
|
|
446
|
-
let elementCreationProperties: ConnectedComponentElementCreationProperties = {
|
|
447
|
-
modelId: 'model-id2', // this model has a @getEspPolimerImmutableModel decorator
|
|
448
|
-
useConnectFunction: false,
|
|
449
|
-
useAlternativeViewContext: true
|
|
450
|
-
};
|
|
451
|
-
api.doRender(
|
|
452
|
-
createConnectedComponentElement(elementCreationProperties),
|
|
453
|
-
elementCreationProperties.modelId
|
|
454
|
-
);
|
|
455
|
-
api.asserts.props
|
|
456
|
-
.receivedPropCountIs(1)
|
|
457
|
-
.propAtIndex(0, props => {
|
|
458
|
-
const mappedModel = props.model as any as MappedModel;
|
|
459
|
-
expect(mappedModel.value2).toBe('initial-value');
|
|
460
|
-
expect(mappedModel.value3).toBe('value-3');
|
|
461
|
-
});
|
|
462
|
-
publishTestEvent(elementCreationProperties.modelId, 'the-event-value');
|
|
463
|
-
api.asserts.props
|
|
464
|
-
.receivedPropCountIs(2)
|
|
465
|
-
.propAtIndex(1, props => {
|
|
466
|
-
const mappedModel = props.model as any as MappedModel;
|
|
467
|
-
expect(mappedModel.value2).toBe('the-event-value');
|
|
468
|
-
});
|
|
469
|
-
});
|
|
470
|
-
|
|
471
452
|
it('will select esp-js-polimer model based on const', () => {
|
|
472
453
|
api.doRender(
|
|
473
454
|
(
|
|
474
455
|
<ConnectableComponent />
|
|
475
456
|
),
|
|
476
|
-
'model-
|
|
457
|
+
'model-id2'
|
|
477
458
|
);
|
|
478
459
|
api.asserts.props
|
|
479
460
|
.receivedPropCountIs(1)
|
|
@@ -482,7 +463,7 @@ describe('ConnectableComponentTests', () => {
|
|
|
482
463
|
expect(props.model.foo).toBe('the-foo');
|
|
483
464
|
});
|
|
484
465
|
act(() => {
|
|
485
|
-
api.router.publishEvent('model-
|
|
466
|
+
api.router.publishEvent('model-id2', 'test-event', 'changed-value');
|
|
486
467
|
});
|
|
487
468
|
api.asserts.props
|
|
488
469
|
.receivedPropCountIs(2)
|
package/tests/indexTests.ts
CHANGED
|
@@ -23,8 +23,6 @@ describe('index exports', () => {
|
|
|
23
23
|
expect(espReact.viewBinding).toBeDefined();
|
|
24
24
|
expect(espReact.ViewBinder).toBeDefined();
|
|
25
25
|
expect(espReact.DEFAULT_VIEW_KEY).toBeDefined();
|
|
26
|
-
expect(espReact.GetEspPolimerImmutableModelConsts).toBeDefined();
|
|
27
|
-
expect(espReact.getEspPolimerImmutableModel).toBeDefined();
|
|
28
26
|
expect(espReact.createViewForModel).toBeDefined();
|
|
29
27
|
expect(espReact.connect).toBeDefined();
|
|
30
28
|
expect(espReact.ConnectableComponent).toBeDefined();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {EventContext, observeEvent} from 'esp-js';
|
|
2
|
-
import {
|
|
2
|
+
import {GetEspPolimerImmutableModelFunctionName} from '../../src/polimer/getEspPolimerImmutableModel';
|
|
3
3
|
|
|
4
4
|
export type TestModelImmutableState = { value: string, modelId: string, entityKey: string };
|
|
5
5
|
|
|
@@ -38,7 +38,7 @@ export class TestModel {
|
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
[
|
|
41
|
+
[GetEspPolimerImmutableModelFunctionName]: () => TestModelImmutableState = () => {
|
|
42
42
|
return this._internalState;
|
|
43
43
|
};
|
|
44
44
|
}
|