@wordpress/core-data 6.21.1-next.f8d8eceb.0 → 6.23.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/CHANGELOG.md +4 -0
- package/README.md +26 -0
- package/build/actions.js +17 -0
- package/build/actions.js.map +1 -1
- package/build/entity-provider.js +7 -1
- package/build/entity-provider.js.map +1 -1
- package/build/queried-data/reducer.js +3 -1
- package/build/queried-data/reducer.js.map +1 -1
- package/build/queried-data/selectors.js +3 -1
- package/build/queried-data/selectors.js.map +1 -1
- package/build/reducer.js +22 -1
- package/build/reducer.js.map +1 -1
- package/build/resolvers.js +12 -1
- package/build/resolvers.js.map +1 -1
- package/build/selectors.js +13 -0
- package/build/selectors.js.map +1 -1
- package/build-module/actions.js +16 -0
- package/build-module/actions.js.map +1 -1
- package/build-module/entity-provider.js +7 -1
- package/build-module/entity-provider.js.map +1 -1
- package/build-module/queried-data/reducer.js +3 -1
- package/build-module/queried-data/reducer.js.map +1 -1
- package/build-module/queried-data/selectors.js +3 -1
- package/build-module/queried-data/selectors.js.map +1 -1
- package/build-module/reducer.js +21 -1
- package/build-module/reducer.js.map +1 -1
- package/build-module/resolvers.js +10 -0
- package/build-module/resolvers.js.map +1 -1
- package/build-module/selectors.js +12 -0
- package/build-module/selectors.js.map +1 -1
- package/build-types/actions.d.ts +9 -0
- package/build-types/actions.d.ts.map +1 -1
- package/build-types/entity-provider.d.ts.map +1 -1
- package/build-types/index.d.ts +6 -0
- package/build-types/index.d.ts.map +1 -1
- package/build-types/queried-data/selectors.d.ts.map +1 -1
- package/build-types/reducer.d.ts +10 -0
- package/build-types/reducer.d.ts.map +1 -1
- package/build-types/resolvers.d.ts +3 -0
- package/build-types/resolvers.d.ts.map +1 -1
- package/build-types/selectors.d.ts +15 -0
- package/build-types/selectors.d.ts.map +1 -1
- package/package.json +17 -17
- package/src/actions.js +16 -0
- package/src/entity-provider.js +8 -1
- package/src/queried-data/reducer.js +3 -3
- package/src/queried-data/selectors.js +3 -1
- package/src/queried-data/test/reducer.js +11 -0
- package/src/reducer.js +21 -0
- package/src/resolvers.js +11 -0
- package/src/selectors.ts +22 -0
- package/tsconfig.tsbuildinfo +1 -1
package/build-types/reducer.d.ts
CHANGED
|
@@ -129,6 +129,15 @@ export function navigationFallbackId(state: null | undefined, action: any): any;
|
|
|
129
129
|
* @return {Record<string, object>} Updated state.
|
|
130
130
|
*/
|
|
131
131
|
export function themeGlobalStyleRevisions(state: Record<string, any> | undefined, action: any): Record<string, object>;
|
|
132
|
+
/**
|
|
133
|
+
* Reducer managing the template lookup per query.
|
|
134
|
+
*
|
|
135
|
+
* @param {Record<string, string>} state Current state.
|
|
136
|
+
* @param {Object} action Dispatched action.
|
|
137
|
+
*
|
|
138
|
+
* @return {Record<string, string>} Updated state.
|
|
139
|
+
*/
|
|
140
|
+
export function defaultTemplates(state: Record<string, string> | undefined, action: any): Record<string, string>;
|
|
132
141
|
export function entities(state: any, action: any): any;
|
|
133
142
|
declare const _default: import("redux").Reducer<import("redux").CombinedState<{
|
|
134
143
|
terms: any;
|
|
@@ -150,6 +159,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
|
|
|
150
159
|
blockPatternCategories: any;
|
|
151
160
|
userPatternCategories: any;
|
|
152
161
|
navigationFallbackId: any;
|
|
162
|
+
defaultTemplates: Record<string, string>;
|
|
153
163
|
}>, any>;
|
|
154
164
|
export default _default;
|
|
155
165
|
export type AnyFunction = import('./types').AnyFunction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../src/reducer.js"],"names":[],"mappings":"AAmBA,2DAA2D;AAE3D;;;;;;;;;;GAUG;AACH,oDAUC;AAED;;;;;;;GAOG;AACH,oDAuBC;AAED;;;;;;;GAOG;AACH,0DAOC;AAED;;;;;;;GAOG;AACH,yDAOC;AAED;;;;;;;GAOG;AACH,oCALW,MAAM,GAAC,SAAS,gBAGf,MAAM,GAAC,SAAS,CAS3B;AAED;;;;;;;GAOG;AACH,6CALW,MAAM,GAAC,SAAS,gBAGf,MAAM,GAAC,SAAS,CAS3B;AAED;;;;;;;GAOG;AACH,4FAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;AAED;;;;;;;GAOG;AACH,iGAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;AAkLD;;;;;;;GAOG;AACH,6DAOC;AA+DD;;GAEG;AACH,sKAEC;AAED,uEAQC;AAED;;;;;;;GAOG;AACH,4DAUC;AAED;;;;;;;;GAQG;AACH,8DAUC;AAED;;;;;;;GAOG;AACH,wDAYC;AAED,0EAOC;AAED,mFAOC;AAED,kFAMC;AAED,gFAOC;AAED;;;;;;;GAOG;AACH,gGAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;
|
|
1
|
+
{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../src/reducer.js"],"names":[],"mappings":"AAmBA,2DAA2D;AAE3D;;;;;;;;;;GAUG;AACH,oDAUC;AAED;;;;;;;GAOG;AACH,oDAuBC;AAED;;;;;;;GAOG;AACH,0DAOC;AAED;;;;;;;GAOG;AACH,yDAOC;AAED;;;;;;;GAOG;AACH,oCALW,MAAM,GAAC,SAAS,gBAGf,MAAM,GAAC,SAAS,CAS3B;AAED;;;;;;;GAOG;AACH,6CALW,MAAM,GAAC,SAAS,gBAGf,MAAM,GAAC,SAAS,CAS3B;AAED;;;;;;;GAOG;AACH,4FAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;AAED;;;;;;;GAOG;AACH,iGAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;AAkLD;;;;;;;GAOG;AACH,6DAOC;AA+DD;;GAEG;AACH,sKAEC;AAED,uEAQC;AAED;;;;;;;GAOG;AACH,4DAUC;AAED;;;;;;;;GAQG;AACH,8DAUC;AAED;;;;;;;GAOG;AACH,wDAYC;AAED,0EAOC;AAED,mFAOC;AAED,kFAMC;AAED,gFAOC;AAED;;;;;;;GAOG;AACH,gGAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;AAED;;;;;;;GAOG;AACH,0FAFY,OAAO,MAAM,EAAE,MAAM,CAAC,CAYjC;AA9MM,uDAmDN;;;;;;;;;;;;;;;;;;;;;;;;0BAlaa,OAAO,SAAS,EAAE,WAAW"}
|
|
@@ -87,4 +87,7 @@ export function getNavigationFallbackId(): ({ dispatch, select }: {
|
|
|
87
87
|
dispatch: any;
|
|
88
88
|
select: any;
|
|
89
89
|
}) => Promise<void>;
|
|
90
|
+
export function getDefaultTemplateId(query: any): ({ dispatch }: {
|
|
91
|
+
dispatch: any;
|
|
92
|
+
}) => Promise<void>;
|
|
90
93
|
//# sourceMappingURL=resolvers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../src/resolvers.js"],"names":[],"mappings":"AA0BO,kCAHI,MAAO,SAAS;;oBAYzB;AAKK;;oBAKL;AAYK,sCAPI,MAAM,QACN,MAAM,2CAEN,MAAO,SAAS;;;oBAuHzB;AAEF;;GAEG;AACH,0CAAuE;AAEvE;;GAEG;AACH,6CAA0E;AAUnE,uCALI,MAAM,QACN,MAAM;;oBAwGf;;IAEF,kEAOC;;AAKM;;;oBAUL;AAEF;;GAEG;AACH,wCAAqE;AAO9D,qCAFI,MAAM;;oBAcf;AAWK,yCALI,MAAM,YAEN,MAAM,MACL,MAAM;;;oBAiEhB;AAUK,8CAJI,MAAM,QACN,MAAM,YACN,MAAM;;oBAef;AAQK,uCAHI,MAAM,UACN,MAAM;;;oBAcf;AAWK,sCAHI,MAAM,UACN,MAAM;;oBAMf;AAOK,uDAFI,MAAM;;;oBAsCf;;IAEF,4CAOC;;AAEM;;;oBAmBL;AAEK;;;oBAWL;AAEK;;;oBAWL;AAKK;;;oBA+BL;;IAEF,gDAOC;;AAEM;;oBAeL;AAEK;;oBAOL;AAEK;;;oBAwBL;AAEK;;;oBAsCL"}
|
|
1
|
+
{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../src/resolvers.js"],"names":[],"mappings":"AA0BO,kCAHI,MAAO,SAAS;;oBAYzB;AAKK;;oBAKL;AAYK,sCAPI,MAAM,QACN,MAAM,2CAEN,MAAO,SAAS;;;oBAuHzB;AAEF;;GAEG;AACH,0CAAuE;AAEvE;;GAEG;AACH,6CAA0E;AAUnE,uCALI,MAAM,QACN,MAAM;;oBAwGf;;IAEF,kEAOC;;AAKM;;;oBAUL;AAEF;;GAEG;AACH,wCAAqE;AAO9D,qCAFI,MAAM;;oBAcf;AAWK,yCALI,MAAM,YAEN,MAAM,MACL,MAAM;;;oBAiEhB;AAUK,8CAJI,MAAM,QACN,MAAM,YACN,MAAM;;oBAef;AAQK,uCAHI,MAAM,UACN,MAAM;;;oBAcf;AAWK,sCAHI,MAAM,UACN,MAAM;;oBAMf;AAOK,uDAFI,MAAM;;;oBAsCf;;IAEF,4CAOC;;AAEM;;;oBAmBL;AAEK;;;oBAWL;AAEK;;;oBAWL;AAKK;;;oBA+BL;;IAEF,gDAOC;;AAEM;;oBAeL;AAEK;;oBAOL;AAEK;;;oBAwBL;AAEK;;;oBAsCL;AAEK;;oBASL"}
|
|
@@ -20,6 +20,7 @@ export interface State {
|
|
|
20
20
|
users: UserState;
|
|
21
21
|
navigationFallbackId: EntityRecordKey;
|
|
22
22
|
userPatternCategories: Array<UserPatternCategory>;
|
|
23
|
+
defaultTemplates: Record<string, string>;
|
|
23
24
|
}
|
|
24
25
|
type EntityRecordKey = string | number;
|
|
25
26
|
interface EntitiesState {
|
|
@@ -52,6 +53,11 @@ interface UserState {
|
|
|
52
53
|
queries: Record<string, EntityRecordKey[]>;
|
|
53
54
|
byId: Record<EntityRecordKey, ET.User<'edit'>>;
|
|
54
55
|
}
|
|
56
|
+
type TemplateQuery = {
|
|
57
|
+
slug?: string;
|
|
58
|
+
is_custom?: boolean;
|
|
59
|
+
ignore_empty?: boolean;
|
|
60
|
+
};
|
|
55
61
|
export interface UserPatternCategory {
|
|
56
62
|
id: number;
|
|
57
63
|
name: string;
|
|
@@ -629,5 +635,14 @@ export declare function getUserPatternCategories(state: State): Array<UserPatter
|
|
|
629
635
|
* @return The current global styles.
|
|
630
636
|
*/
|
|
631
637
|
export declare function getCurrentThemeGlobalStylesRevisions(state: State): Array<object> | null;
|
|
638
|
+
/**
|
|
639
|
+
* Returns the default template use to render a given query.
|
|
640
|
+
*
|
|
641
|
+
* @param state Data state.
|
|
642
|
+
* @param query Query.
|
|
643
|
+
*
|
|
644
|
+
* @return The default template id for the given query.
|
|
645
|
+
*/
|
|
646
|
+
export declare function getDefaultTemplateId(state: State, query: TemplateQuery): string;
|
|
632
647
|
export {};
|
|
633
648
|
//# sourceMappingURL=selectors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../src/selectors.ts"],"names":[],"mappings":";AAwBA,OAAO,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAM3D,MAAM,WAAW,KAAK;IACrB,SAAS,EAAE,MAAM,CAAE,MAAM,GAAG,MAAM,EAAE,KAAK,CAAE,OAAO,CAAE,CAAE,CAAC;IACvD,aAAa,EAAE,KAAK,CAAE,OAAO,CAAE,CAAC;IAChC,sBAAsB,EAAE,KAAK,CAAE,OAAO,CAAE,CAAC;IACzC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,EAAE,CAAC,IAAI,CAAE,MAAM,CAAE,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAE,CAAC;IAClD,QAAQ,EAAE,aAAa,CAAC;IACxB,qBAAqB,EAAE,MAAM,CAAE,MAAM,EAAE,MAAM,CAAE,CAAC;IAChD,0BAA0B,EAAE,MAAM,CAAE,MAAM,EAAE,MAAM,CAAE,CAAC;IACrD,yBAAyB,EAAE,MAAM,CAAE,MAAM,EAAE,MAAM,CAAE,CAAC;IACpD,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,MAAM,CAAE,MAAM,EAAE,OAAO,CAAE,CAAC;IAC3C,KAAK,EAAE,SAAS,CAAC;IACjB,oBAAoB,EAAE,eAAe,CAAC;IACtC,qBAAqB,EAAE,KAAK,CAAE,mBAAmB,CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../src/selectors.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wordpress/core-data",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.23.0",
|
|
4
4
|
"description": "Access to and manipulation of core WordPress entities.",
|
|
5
5
|
"author": "The WordPress Contributors",
|
|
6
6
|
"license": "GPL-2.0-or-later",
|
|
@@ -31,21 +31,21 @@
|
|
|
31
31
|
],
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@babel/runtime": "^7.16.0",
|
|
34
|
-
"@wordpress/api-fetch": "^6.
|
|
35
|
-
"@wordpress/block-editor": "^12.
|
|
36
|
-
"@wordpress/blocks": "^12.
|
|
37
|
-
"@wordpress/compose": "^6.
|
|
38
|
-
"@wordpress/data": "^9.
|
|
39
|
-
"@wordpress/deprecated": "^3.
|
|
40
|
-
"@wordpress/element": "^5.
|
|
41
|
-
"@wordpress/html-entities": "^3.
|
|
42
|
-
"@wordpress/i18n": "^4.
|
|
43
|
-
"@wordpress/is-shallow-equal": "^4.
|
|
44
|
-
"@wordpress/private-apis": "^0.
|
|
45
|
-
"@wordpress/rich-text": "^6.
|
|
46
|
-
"@wordpress/sync": "^0.
|
|
47
|
-
"@wordpress/undo-manager": "^0.
|
|
48
|
-
"@wordpress/url": "^3.
|
|
34
|
+
"@wordpress/api-fetch": "^6.43.0",
|
|
35
|
+
"@wordpress/block-editor": "^12.14.0",
|
|
36
|
+
"@wordpress/blocks": "^12.23.0",
|
|
37
|
+
"@wordpress/compose": "^6.23.0",
|
|
38
|
+
"@wordpress/data": "^9.16.0",
|
|
39
|
+
"@wordpress/deprecated": "^3.46.0",
|
|
40
|
+
"@wordpress/element": "^5.23.0",
|
|
41
|
+
"@wordpress/html-entities": "^3.46.0",
|
|
42
|
+
"@wordpress/i18n": "^4.46.0",
|
|
43
|
+
"@wordpress/is-shallow-equal": "^4.46.0",
|
|
44
|
+
"@wordpress/private-apis": "^0.28.0",
|
|
45
|
+
"@wordpress/rich-text": "^6.23.0",
|
|
46
|
+
"@wordpress/sync": "^0.8.0",
|
|
47
|
+
"@wordpress/undo-manager": "^0.6.0",
|
|
48
|
+
"@wordpress/url": "^3.47.0",
|
|
49
49
|
"change-case": "^4.1.2",
|
|
50
50
|
"equivalent-key-map": "^0.2.2",
|
|
51
51
|
"fast-deep-equal": "^3.1.3",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"publishConfig": {
|
|
61
61
|
"access": "public"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "839018ff6029ba749780e288e08ff9cd898e50e8"
|
|
64
64
|
}
|
package/src/actions.js
CHANGED
|
@@ -908,3 +908,19 @@ export function receiveNavigationFallbackId( fallbackId ) {
|
|
|
908
908
|
fallbackId,
|
|
909
909
|
};
|
|
910
910
|
}
|
|
911
|
+
|
|
912
|
+
/**
|
|
913
|
+
* Returns an action object used to set the template for a given query.
|
|
914
|
+
*
|
|
915
|
+
* @param {Object} query The lookup query.
|
|
916
|
+
* @param {string} templateId The resolved template id.
|
|
917
|
+
*
|
|
918
|
+
* @return {Object} Action object.
|
|
919
|
+
*/
|
|
920
|
+
export function receiveDefaultTemplateId( query, templateId ) {
|
|
921
|
+
return {
|
|
922
|
+
type: 'RECEIVE_DEFAULT_TEMPLATE',
|
|
923
|
+
query,
|
|
924
|
+
templateId,
|
|
925
|
+
};
|
|
926
|
+
}
|
package/src/entity-provider.js
CHANGED
|
@@ -155,6 +155,9 @@ export function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
|
|
|
155
155
|
const id = _id ?? providerId;
|
|
156
156
|
const { content, editedBlocks, meta } = useSelect(
|
|
157
157
|
( select ) => {
|
|
158
|
+
if ( ! id ) {
|
|
159
|
+
return {};
|
|
160
|
+
}
|
|
158
161
|
const { getEditedEntityRecord } = select( STORE_NAME );
|
|
159
162
|
const editedRecord = getEditedEntityRecord( kind, name, id );
|
|
160
163
|
return {
|
|
@@ -169,6 +172,10 @@ export function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
|
|
|
169
172
|
useDispatch( STORE_NAME );
|
|
170
173
|
|
|
171
174
|
const blocks = useMemo( () => {
|
|
175
|
+
if ( ! id ) {
|
|
176
|
+
return undefined;
|
|
177
|
+
}
|
|
178
|
+
|
|
172
179
|
if ( editedBlocks ) {
|
|
173
180
|
return editedBlocks;
|
|
174
181
|
}
|
|
@@ -176,7 +183,7 @@ export function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
|
|
|
176
183
|
return content && typeof content !== 'function'
|
|
177
184
|
? parse( content )
|
|
178
185
|
: EMPTY_ARRAY;
|
|
179
|
-
}, [ editedBlocks, content ] );
|
|
186
|
+
}, [ id, editedBlocks, content ] );
|
|
180
187
|
|
|
181
188
|
const updateFootnotes = useCallback(
|
|
182
189
|
( _blocks ) => updateFootnotesFromMeta( _blocks, meta ),
|
|
@@ -56,10 +56,10 @@ export function getMergedItemIds( itemIds, nextItemIds, page, perPage ) {
|
|
|
56
56
|
|
|
57
57
|
for ( let i = 0; i < size; i++ ) {
|
|
58
58
|
// Preserve existing item ID except for subset of range of next items.
|
|
59
|
+
// We need to check against the possible maximum upper boundary because
|
|
60
|
+
// a page could recieve less items than what was previously stored.
|
|
59
61
|
const isInNextItemsRange =
|
|
60
|
-
i >= nextItemIdsStartIndex &&
|
|
61
|
-
i < nextItemIdsStartIndex + nextItemIds.length;
|
|
62
|
-
|
|
62
|
+
i >= nextItemIdsStartIndex && i < nextItemIdsStartIndex + perPage;
|
|
63
63
|
mergedItemIds[ i ] = isInNextItemsRange
|
|
64
64
|
? nextItemIds[ i - nextItemIdsStartIndex ]
|
|
65
65
|
: itemIds?.[ i ];
|
|
@@ -52,7 +52,9 @@ function getQueriedItemsUncached( state, query ) {
|
|
|
52
52
|
if ( Array.isArray( include ) && ! include.includes( itemId ) ) {
|
|
53
53
|
continue;
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
if ( itemId === undefined ) {
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
56
58
|
// Having a target item ID doesn't guarantee that this object has been queried.
|
|
57
59
|
if ( ! state.items[ context ]?.hasOwnProperty( itemId ) ) {
|
|
58
60
|
return null;
|
|
@@ -64,6 +64,17 @@ describe( 'getMergedItemIds', () => {
|
|
|
64
64
|
|
|
65
65
|
expect( result ).toEqual( [ 1, 3, 4 ] );
|
|
66
66
|
} );
|
|
67
|
+
it( 'should update a page properly if less items are provided than previously stored', () => {
|
|
68
|
+
let original = deepFreeze( [ 1, 2, 3 ] );
|
|
69
|
+
let result = getMergedItemIds( original, [ 1, 2 ], 1, 3 );
|
|
70
|
+
|
|
71
|
+
expect( result ).toEqual( [ 1, 2 ] );
|
|
72
|
+
|
|
73
|
+
original = deepFreeze( [ 1, 2, 3, 4, 5, 6 ] );
|
|
74
|
+
result = getMergedItemIds( original, [ 9 ], 2, 2 );
|
|
75
|
+
|
|
76
|
+
expect( result ).toEqual( [ 1, 2, 9, undefined, 5, 6 ] );
|
|
77
|
+
} );
|
|
67
78
|
} );
|
|
68
79
|
|
|
69
80
|
describe( 'itemIsComplete', () => {
|
package/src/reducer.js
CHANGED
|
@@ -572,6 +572,26 @@ export function themeGlobalStyleRevisions( state = {}, action ) {
|
|
|
572
572
|
return state;
|
|
573
573
|
}
|
|
574
574
|
|
|
575
|
+
/**
|
|
576
|
+
* Reducer managing the template lookup per query.
|
|
577
|
+
*
|
|
578
|
+
* @param {Record<string, string>} state Current state.
|
|
579
|
+
* @param {Object} action Dispatched action.
|
|
580
|
+
*
|
|
581
|
+
* @return {Record<string, string>} Updated state.
|
|
582
|
+
*/
|
|
583
|
+
export function defaultTemplates( state = {}, action ) {
|
|
584
|
+
switch ( action.type ) {
|
|
585
|
+
case 'RECEIVE_DEFAULT_TEMPLATE':
|
|
586
|
+
return {
|
|
587
|
+
...state,
|
|
588
|
+
[ JSON.stringify( action.query ) ]: action.templateId,
|
|
589
|
+
};
|
|
590
|
+
}
|
|
591
|
+
|
|
592
|
+
return state;
|
|
593
|
+
}
|
|
594
|
+
|
|
575
595
|
export default combineReducers( {
|
|
576
596
|
terms,
|
|
577
597
|
users,
|
|
@@ -592,4 +612,5 @@ export default combineReducers( {
|
|
|
592
612
|
blockPatternCategories,
|
|
593
613
|
userPatternCategories,
|
|
594
614
|
navigationFallbackId,
|
|
615
|
+
defaultTemplates,
|
|
595
616
|
} );
|
package/src/resolvers.js
CHANGED
|
@@ -707,3 +707,14 @@ export const getNavigationFallbackId =
|
|
|
707
707
|
] );
|
|
708
708
|
}
|
|
709
709
|
};
|
|
710
|
+
|
|
711
|
+
export const getDefaultTemplateId =
|
|
712
|
+
( query ) =>
|
|
713
|
+
async ( { dispatch } ) => {
|
|
714
|
+
const template = await apiFetch( {
|
|
715
|
+
path: addQueryArgs( '/wp/v2/templates/lookup', query ),
|
|
716
|
+
} );
|
|
717
|
+
if ( template ) {
|
|
718
|
+
dispatch.receiveDefaultTemplateId( query, template.id );
|
|
719
|
+
}
|
|
720
|
+
};
|
package/src/selectors.ts
CHANGED
|
@@ -46,6 +46,7 @@ export interface State {
|
|
|
46
46
|
users: UserState;
|
|
47
47
|
navigationFallbackId: EntityRecordKey;
|
|
48
48
|
userPatternCategories: Array< UserPatternCategory >;
|
|
49
|
+
defaultTemplates: Record< string, string >;
|
|
49
50
|
}
|
|
50
51
|
|
|
51
52
|
type EntityRecordKey = string | number;
|
|
@@ -81,6 +82,12 @@ interface UserState {
|
|
|
81
82
|
byId: Record< EntityRecordKey, ET.User< 'edit' > >;
|
|
82
83
|
}
|
|
83
84
|
|
|
85
|
+
type TemplateQuery = {
|
|
86
|
+
slug?: string;
|
|
87
|
+
is_custom?: boolean;
|
|
88
|
+
ignore_empty?: boolean;
|
|
89
|
+
};
|
|
90
|
+
|
|
84
91
|
export interface UserPatternCategory {
|
|
85
92
|
id: number;
|
|
86
93
|
name: string;
|
|
@@ -1351,3 +1358,18 @@ export function getCurrentThemeGlobalStylesRevisions(
|
|
|
1351
1358
|
|
|
1352
1359
|
return state.themeGlobalStyleRevisions[ currentGlobalStylesId ];
|
|
1353
1360
|
}
|
|
1361
|
+
|
|
1362
|
+
/**
|
|
1363
|
+
* Returns the default template use to render a given query.
|
|
1364
|
+
*
|
|
1365
|
+
* @param state Data state.
|
|
1366
|
+
* @param query Query.
|
|
1367
|
+
*
|
|
1368
|
+
* @return The default template id for the given query.
|
|
1369
|
+
*/
|
|
1370
|
+
export function getDefaultTemplateId(
|
|
1371
|
+
state: State,
|
|
1372
|
+
query: TemplateQuery
|
|
1373
|
+
): string {
|
|
1374
|
+
return state.defaultTemplates[ JSON.stringify( query ) ];
|
|
1375
|
+
}
|