@plaudit/gutenberg-api-extensions 2.92.0 → 2.93.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 +15 -0
- package/dist/controls/AsynchronousFormTokenField.js +1 -1
- package/dist/controls/AsynchronousFormTokenField.js.map +1 -1
- package/dist/controls/ExtendedFormTokenField.d.ts +1 -1
- package/dist/controls/ExtendedFormTokenField.js +30 -12
- package/dist/controls/ExtendedFormTokenField.js.map +1 -1
- package/dist/controls/hooks/useImprovedTokenManager.d.ts +1 -0
- package/dist/controls/hooks/useImprovedTokenManager.js +11 -4
- package/dist/controls/hooks/useImprovedTokenManager.js.map +1 -1
- package/dist/controls/hooks/useMultiSingleConversionLayer.d.ts +4 -1
- package/dist/controls/hooks/useMultiSingleConversionLayer.js +4 -4
- package/dist/controls/hooks/useMultiSingleConversionLayer.js.map +1 -1
- package/dist/lib/helpers.d.ts +2 -1
- package/dist/lib/helpers.js +5 -0
- package/dist/lib/helpers.js.map +1 -1
- package/dist/lib/useful-types.d.ts +6 -0
- package/dist/lib/useful-types.js +20 -0
- package/dist/lib/useful-types.js.map +1 -1
- package/package.json +11 -11
- package/src/controls/AsynchronousFormTokenField.tsx +1 -1
- package/src/controls/ExtendedFormTokenField.tsx +39 -17
- package/src/controls/hooks/useImprovedTokenManager.ts +12 -5
- package/src/controls/hooks/useMultiSingleConversionLayer.ts +5 -5
- package/src/lib/helpers.ts +5 -1
- package/src/lib/useful-types.ts +25 -0
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [2.93.0] - 2026-04-15
|
|
9
|
+
### Added
|
|
10
|
+
- Helpers for working with `WP_Error` responses from WP REST API calls client-side
|
|
11
|
+
- Better error reporting to `ExtendedFormTokenFields`
|
|
12
|
+
|
|
13
|
+
### Fixed
|
|
14
|
+
- `ExtendedFormTokenFields` triggering an unfiltered load suggestions call on initialization
|
|
15
|
+
|
|
16
|
+
### Internals
|
|
17
|
+
- Temporarily pinned all WordPress dependencies because they bricked the typedefs for `@wordpress/blocks`
|
|
18
|
+
|
|
19
|
+
## [2.92.1] - 2026-04-14
|
|
20
|
+
### Fixed
|
|
21
|
+
- The order of items in `ExtendedFormTokenField` getting reset on save after reloading the editor (credit: David)
|
|
22
|
+
|
|
8
23
|
## [2.92.0] - 2026-04-13
|
|
9
24
|
### Added
|
|
10
25
|
- `InsertSiblingOrChildBlockShortcut` and `InsertSiblingOrChildBlockShortcutButton` React components
|
|
@@ -22,7 +22,7 @@ var ValidationState;
|
|
|
22
22
|
*/
|
|
23
23
|
function AsynchronousFormTokenField(props) {
|
|
24
24
|
const { help, expandOnFocus = false } = props;
|
|
25
|
-
const
|
|
25
|
+
const { value, setValue } = (0, useMultiSingleConversionLayer_1.useMultiSingleConversionLayer)(props.value, props.onChange, props.makeTokenFromSuggestion, props.multiple);
|
|
26
26
|
const { currentTokens, dispatchValueUpdate, hasValidationError, isInitializing, isValidating, tokenTitleMappings } = (0, useTokenManager_1.useTokenManager)(value, setValue, props.validationQuery, props.makeTokenFromSuggestion);
|
|
27
27
|
const { hasLoadingError, isLoading, suggestions, input, setInput } = (0, useSuggestions_1.useSuggestions)(undefined, { expandOnFocus, getSuggestions: props.suggestionQuery });
|
|
28
28
|
const displayTransform = (0, element_1.useCallback)((token) => tokenTitleMappings[token] ?? token, [tokenTitleMappings]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AsynchronousFormTokenField.js","sourceRoot":"","sources":["../../src/controls/AsynchronousFormTokenField.tsx"],"names":[],"mappings":";;;AA2CA,gEA0CC;;AArFD,sDAA8D;AAC9D,gDAA+C;AAC/C,0CAAmC;AAGnC,yFAAoF;AACpF,2DAAsD;AACtD,6DAAwD;AAGxD,sIAAsI;AACtI,IAAkB,eAKjB;AALD,WAAkB,eAAe;IAChC,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;IACjB,4CAAyB,CAAA;IACzB,sCAAmB,CAAA;AACpB,CAAC,EALiB,eAAe,+BAAf,eAAe,QAKhC;AAwBD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,KAAsC;IAChF,MAAM,EAAC,IAAI,EAAE,aAAa,GAAG,KAAK,EAAC,GAAG,KAAK,CAAC;IAE5C,MAAM,
|
|
1
|
+
{"version":3,"file":"AsynchronousFormTokenField.js","sourceRoot":"","sources":["../../src/controls/AsynchronousFormTokenField.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type MapSelect } from "@wordpress/data";
|
|
2
2
|
import type { SNPControlSlots } from "../blocks";
|
|
3
|
-
import type { TokenItem } from "../lib/useful-types";
|
|
4
3
|
import { packDisplayTokenText, unpackDisplayedTokenText, ValidationState } from "./hooks/useImprovedTokenManager";
|
|
4
|
+
import { TokenItem } from "../lib/useful-types";
|
|
5
5
|
export { packDisplayTokenText, unpackDisplayedTokenText, ValidationState };
|
|
6
6
|
import type { ReactNode } from "react";
|
|
7
7
|
type ExtendedFormTokenFieldPropsBase = {
|
|
@@ -13,26 +13,35 @@ Object.defineProperty(exports, "packDisplayTokenText", { enumerable: true, get:
|
|
|
13
13
|
Object.defineProperty(exports, "unpackDisplayedTokenText", { enumerable: true, get: function () { return useImprovedTokenManager_1.unpackDisplayedTokenText; } });
|
|
14
14
|
Object.defineProperty(exports, "ValidationState", { enumerable: true, get: function () { return useImprovedTokenManager_1.ValidationState; } });
|
|
15
15
|
const useMultiSingleConversionLayer_1 = require("./hooks/useMultiSingleConversionLayer");
|
|
16
|
+
const helpers_1 = require("../lib/helpers");
|
|
17
|
+
const EMPTY_ARRAY = [];
|
|
16
18
|
function ExtendedFormTokenField(props) {
|
|
17
19
|
const [debouncedInput, setDebouncedInput, setImmediateInput, input] = useDebouncedValue('');
|
|
20
|
+
const [hasBeenFocused, setHasBeenFocused] = (0, element_1.useState)(false);
|
|
18
21
|
const tokenTitleCacheRef = (0, element_1.useRef)(undefined);
|
|
19
22
|
if (tokenTitleCacheRef.current === undefined) {
|
|
20
23
|
tokenTitleCacheRef.current = new Map();
|
|
21
24
|
}
|
|
22
|
-
const { rawSuggestions, isLoading, hasLoadingError } = (0, data_1.useSelect)((select, registry) => {
|
|
23
|
-
if (!debouncedInput && props.initialSuggestions !== undefined) {
|
|
24
|
-
return { rawSuggestions: props.initialSuggestions, isLoading: false };
|
|
25
|
+
const { rawSuggestions, isLoading, hasLoadingError, thrownLoadingError } = (0, data_1.useSelect)((select, registry) => {
|
|
26
|
+
if (!debouncedInput && (!hasBeenFocused || props.initialSuggestions !== undefined)) {
|
|
27
|
+
return { rawSuggestions: props.initialSuggestions ?? EMPTY_ARRAY, isLoading: false };
|
|
28
|
+
}
|
|
29
|
+
let res;
|
|
30
|
+
try {
|
|
31
|
+
res = props.suggestionQuery(debouncedInput, select, registry);
|
|
32
|
+
}
|
|
33
|
+
catch (e) {
|
|
34
|
+
return { rawSuggestions: [], isLoading: false, hasLoadingError: true, thrownLoadingError: (0, helpers_1.potentialWpErrorToString)(e) };
|
|
25
35
|
}
|
|
26
|
-
const res = props.suggestionQuery(debouncedInput, select, registry);
|
|
27
36
|
if (res === undefined) {
|
|
28
|
-
return { rawSuggestions: props.initialSuggestions, isLoading: true };
|
|
37
|
+
return { rawSuggestions: props.initialSuggestions ?? EMPTY_ARRAY, isLoading: true };
|
|
29
38
|
}
|
|
30
39
|
return { rawSuggestions: res, isLoading: false, hasLoadingError: props.hasLoadingError?.(debouncedInput, select, registry) };
|
|
31
|
-
}, [debouncedInput, props.initialSuggestions, props.suggestionQuery]);
|
|
40
|
+
}, [debouncedInput, props.initialSuggestions, props.suggestionQuery, hasBeenFocused]);
|
|
32
41
|
const suggestions = (0, element_1.useMemo)(() => rawSuggestions?.map(useImprovedTokenManager_1.packDisplayTokenText), [rawSuggestions]);
|
|
33
|
-
const
|
|
34
|
-
const { currentTokens, isValidating, updateComponentValue, tokenStatusCache } = (0, useImprovedTokenManager_1.useImprovedTokenManager)(value, setValue, props.validationQuery, props.stringToTokenConverter, tokenTitleCacheRef.current);
|
|
35
|
-
// This is just a trick to avoid needing to
|
|
42
|
+
const { value, setValue } = (0, useMultiSingleConversionLayer_1.useMultiSingleConversionLayer)(props.value, props.onChange, props.stringToTokenConverter, props.multiple);
|
|
43
|
+
const { currentTokens, isValidating, updateComponentValue, tokenStatusCache, thrownValidationError } = (0, useImprovedTokenManager_1.useImprovedTokenManager)(value, setValue, props.validationQuery, props.stringToTokenConverter, tokenTitleCacheRef.current);
|
|
44
|
+
// This is just a trick to avoid needing to send an additional validation request when adding a token from the suggestions list
|
|
36
45
|
(0, element_1.useMemo)(() => {
|
|
37
46
|
if (rawSuggestions) {
|
|
38
47
|
for (const suggestion of rawSuggestions) {
|
|
@@ -43,12 +52,21 @@ function ExtendedFormTokenField(props) {
|
|
|
43
52
|
}
|
|
44
53
|
}, [rawSuggestions, tokenStatusCache]);
|
|
45
54
|
const { hasValidationError } = (0, data_1.useSelect)((select, registry) => ({
|
|
46
|
-
hasValidationError: props.hasValidationError?.(select, registry)
|
|
47
|
-
}), [props.hasLoadingError, props.hasValidationError]);
|
|
55
|
+
hasValidationError: !!thrownValidationError || props.hasValidationError?.(select, registry)
|
|
56
|
+
}), [props.hasLoadingError, props.hasValidationError, thrownValidationError]);
|
|
48
57
|
const { help, expandOnFocus = false } = props;
|
|
49
58
|
//TODO: If focus is in field but user hasn't started typing, show a message telling them to start typing
|
|
50
|
-
return (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(components_1.FormTokenField, { value: currentTokens, label: props.label, placeholder: "Start typing to see suggestions", suggestions: suggestions, onChange: updateComponentValue, displayTransform: (0, element_1.useCallback)((token) => tokenTitleCacheRef.current.get((0, useImprovedTokenManager_1.unpackDisplayedTokenText)(token).value) ?? token, [tokenTitleCacheRef]), maxLength: props.multiple !== false ? props.maxLength : 1, __experimentalValidateInput: props.validator, __experimentalAutoSelectFirstMatch: true, __experimentalExpandOnFocus: expandOnFocus, __experimentalShowHowTo: props.multiple !== false, onInputChange: setDebouncedInput, onFocus: (0, element_1.useCallback)(() =>
|
|
59
|
+
return (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(components_1.FormTokenField, { value: currentTokens, label: props.label, placeholder: "Start typing to see suggestions", suggestions: suggestions, onChange: updateComponentValue, displayTransform: (0, element_1.useCallback)((token) => tokenTitleCacheRef.current.get((0, useImprovedTokenManager_1.unpackDisplayedTokenText)(token).value) ?? token, [tokenTitleCacheRef]), maxLength: props.multiple !== false ? props.maxLength : 1, __experimentalValidateInput: props.validator, __experimentalAutoSelectFirstMatch: true, __experimentalExpandOnFocus: expandOnFocus, __experimentalShowHowTo: props.multiple !== false, onInputChange: setDebouncedInput, onFocus: (0, element_1.useCallback)(() => {
|
|
60
|
+
setHasBeenFocused(true);
|
|
61
|
+
setImmediateInput(input);
|
|
62
|
+
}, [input]), __next40pxDefaultSize: true, __nextHasNoMarginBottom: true }), help && (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)("span", { className: "components-form-token-field__help", children: help }) }), hasLoadingError && (0, jsx_runtime_1.jsx)(ErrorSummaryWithModal, { summary: (0, jsx_runtime_1.jsx)("span", { className: "components-form-token-field__help", children: (0, i18n_1.__)("An Error Occurred While Loading Suggestions") }), detail: thrownLoadingError }), isLoading && (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(components_1.Spinner, {}), (0, jsx_runtime_1.jsx)("span", { className: "components-form-token-field__help", children: (0, i18n_1.__)("Updating Suggestions") })] }), hasValidationError && (0, jsx_runtime_1.jsx)(ErrorSummaryWithModal, { summary: (0, jsx_runtime_1.jsx)("span", { className: "components-form-token-field__help", children: (0, i18n_1.__)("An Error Occurred While Validating") }), detail: thrownValidationError }), isValidating && (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(components_1.Spinner, {}), (0, jsx_runtime_1.jsx)("span", { className: "components-form-token-field__help", children: (0, i18n_1.__)("Validating") })] })] });
|
|
51
63
|
}
|
|
64
|
+
const ErrorSummaryWithModal = (0, element_1.memo)(({ summary, detail }) => {
|
|
65
|
+
const [isOpen, setOpen] = (0, element_1.useState)(false);
|
|
66
|
+
const openModal = (0, element_1.useCallback)(() => setOpen(true), [setOpen]);
|
|
67
|
+
const closeModal = () => setOpen(false);
|
|
68
|
+
return (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { onClick: openModal, children: summary }), isOpen && (0, jsx_runtime_1.jsx)(components_1.Modal, { title: "Error Details", onRequestClose: closeModal, children: (0, jsx_runtime_1.jsx)("pre", { children: detail }) })] });
|
|
69
|
+
});
|
|
52
70
|
function useDebouncedValue(defaultValue) {
|
|
53
71
|
const [value, setValue] = (0, element_1.useState)(defaultValue);
|
|
54
72
|
const [debouncedValue, setDebouncedState] = (0, element_1.useState)(defaultValue);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtendedFormTokenField.js","sourceRoot":"","sources":["../../src/controls/ExtendedFormTokenField.tsx"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ExtendedFormTokenField.js","sourceRoot":"","sources":["../../src/controls/ExtendedFormTokenField.tsx"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ type ImprovedTokenManagerReturnType = {
|
|
|
20
20
|
isValidating: boolean;
|
|
21
21
|
updateComponentValue: (value: (((prevState: (string | TokenItem)[]) => (string | TokenItem)[]) | (string | TokenItem)[])) => void;
|
|
22
22
|
tokenStatusCache: Map<TokenItem["value"], TokenItem["status"]>;
|
|
23
|
+
thrownValidationError?: string;
|
|
23
24
|
};
|
|
24
25
|
export declare function useImprovedTokenManager(initialValue: (string | TokenItem)[] | undefined, writeBackingValue: (value: TokenItem[]) => void, validationQuery: TokenManagementCallbacks['validationQuery'], makeTokenFromString: TokenManagementCallbacks['stringToTokenConverter'], tokenTitleCache: Map<TokenItem['value'], TokenItem['title']>): ImprovedTokenManagerReturnType;
|
|
25
26
|
export {};
|
|
@@ -6,6 +6,7 @@ exports.unpackDisplayedTokenText = unpackDisplayedTokenText;
|
|
|
6
6
|
exports.useImprovedTokenManager = useImprovedTokenManager;
|
|
7
7
|
const data_1 = require("@wordpress/data");
|
|
8
8
|
const element_1 = require("@wordpress/element");
|
|
9
|
+
const helpers_1 = require("../../lib/helpers");
|
|
9
10
|
function packDisplayTokenText(token) {
|
|
10
11
|
return `${token.title || token.value} (#${token.value})`;
|
|
11
12
|
}
|
|
@@ -27,14 +28,14 @@ function useImprovedTokenManager(initialValue, writeBackingValue, validationQuer
|
|
|
27
28
|
tokenStatusCacheRef.current = new Map();
|
|
28
29
|
}
|
|
29
30
|
const convertedTokens = useTokenConverter(componentValue, makeTokenFromString, tokenStatusCacheRef.current);
|
|
30
|
-
const { isValidating, validatedTokens } = useTokenValidator(convertedTokens, validationQuery, tokenStatusCacheRef.current);
|
|
31
|
+
const { isValidating, validatedTokens, thrownValidationError } = useTokenValidator(convertedTokens, validationQuery, tokenStatusCacheRef.current);
|
|
31
32
|
const titledTokens = useTokenTitleApplier(validatedTokens, tokenTitleCache);
|
|
32
33
|
(0, element_1.useEffect)(() => {
|
|
33
34
|
if (!isValidating) {
|
|
34
35
|
writeBackingValue(titledTokens);
|
|
35
36
|
}
|
|
36
37
|
}, [titledTokens, isValidating]);
|
|
37
|
-
return { currentTokens: titledTokens, isValidating, updateComponentValue, tokenStatusCache: tokenStatusCacheRef.current };
|
|
38
|
+
return { currentTokens: titledTokens, isValidating, updateComponentValue, tokenStatusCache: tokenStatusCacheRef.current, thrownValidationError };
|
|
38
39
|
}
|
|
39
40
|
function syncTokenTitles(token, cache) {
|
|
40
41
|
return { ...token, title: cache.get(token.value) ?? addTokenTitleToCache(token, cache) ?? packDisplayTokenText(token) };
|
|
@@ -103,14 +104,20 @@ function useTokenValidator(convertedTokens, validationQuery, tokenStatusCache) {
|
|
|
103
104
|
}, [convertedTokens, tokenStatusCache]);
|
|
104
105
|
return (0, data_1.useSelect)((select, registry) => {
|
|
105
106
|
if (statusUpdatedConvertedTokens.some(token => token.status === undefined || token.status === ValidationState.Validating)) {
|
|
106
|
-
|
|
107
|
+
let res;
|
|
108
|
+
try {
|
|
109
|
+
res = validationQuery(statusUpdatedConvertedTokenValues, select, registry);
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
return { validatedTokens: statusUpdatedConvertedTokens, isValidating: false, thrownValidationError: (0, helpers_1.potentialWpErrorToString)(e) };
|
|
113
|
+
}
|
|
107
114
|
if (res !== undefined) {
|
|
108
115
|
const validTokens = new Map(res.map(token => [token.value, token]));
|
|
109
116
|
const validatedTokens = convertedTokens.map(token => validTokens.get(token.value) ?? { ...token, status: ValidationState.Invalid });
|
|
110
117
|
for (const token of validatedTokens) {
|
|
111
118
|
tokenStatusCache.set(token.value, token.status);
|
|
112
119
|
}
|
|
113
|
-
return { validatedTokens
|
|
120
|
+
return { validatedTokens, isValidating: false };
|
|
114
121
|
}
|
|
115
122
|
else {
|
|
116
123
|
return { validatedTokens: statusUpdatedConvertedTokens, isValidating: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useImprovedTokenManager.js","sourceRoot":"","sources":["../../../src/controls/hooks/useImprovedTokenManager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"useImprovedTokenManager.js","sourceRoot":"","sources":["../../../src/controls/hooks/useImprovedTokenManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import type { TokenItem } from "../../lib/useful-types";
|
|
2
|
-
export type ValueConverter =
|
|
2
|
+
export type ValueConverter = {
|
|
3
|
+
value: string[];
|
|
4
|
+
setValue(value: TokenItem[]): void;
|
|
5
|
+
};
|
|
3
6
|
export declare function useMultiSingleConversionLayer(value: string | string[] | undefined, onChange: ((tokens: string[]) => void) | ((token: string) => void), makeTokenFromSuggestion: (suggestion: string) => TokenItem, multiple?: boolean): ValueConverter;
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.useMultiSingleConversionLayer = useMultiSingleConversionLayer;
|
|
4
4
|
const element_1 = require("@wordpress/element");
|
|
5
5
|
function useMultiSingleConversionLayer(value, onChange, makeTokenFromSuggestion, multiple = true) {
|
|
6
|
-
return
|
|
7
|
-
(0, element_1.useMemo)(() => value === undefined ? [] : (Array.isArray(value) ? value : [value]), [value]),
|
|
8
|
-
(0, element_1.useCallback)(tokens => {
|
|
6
|
+
return {
|
|
7
|
+
value: (0, element_1.useMemo)(() => value === undefined ? [] : (Array.isArray(value) ? value : [value]), [value]),
|
|
8
|
+
setValue: (0, element_1.useCallback)(tokens => {
|
|
9
9
|
const bareTokens = tokens.filter(token => token.status === 'success').map(token => token.value);
|
|
10
10
|
onChange((multiple ? bareTokens : bareTokens[0]));
|
|
11
11
|
}, [onChange, makeTokenFromSuggestion, multiple])
|
|
12
|
-
|
|
12
|
+
};
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=useMultiSingleConversionLayer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultiSingleConversionLayer.js","sourceRoot":"","sources":["../../../src/controls/hooks/useMultiSingleConversionLayer.ts"],"names":[],"mappings":";;AAKA,sEAWC;AAhBD,gDAAwD;AAKxD,SAAgB,6BAA6B,CAC5C,KAAgC,EAAE,QAAgE,EAClG,uBAA0D,EAAE,QAAQ,GAAG,IAAI;IAE3E,OAAO;QACN,IAAA,iBAAO,EAAC,GAAG,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useMultiSingleConversionLayer.js","sourceRoot":"","sources":["../../../src/controls/hooks/useMultiSingleConversionLayer.ts"],"names":[],"mappings":";;AAKA,sEAWC;AAhBD,gDAAwD;AAKxD,SAAgB,6BAA6B,CAC5C,KAAgC,EAAE,QAAgE,EAClG,uBAA0D,EAAE,QAAQ,GAAG,IAAI;IAE3E,OAAO;QACN,KAAK,EAAE,IAAA,iBAAO,EAAC,GAAG,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAClG,QAAQ,EAAE,IAAA,qBAAW,EAAC,MAAM,CAAC,EAAE;YAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAChG,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAC;QAC1D,CAAC,EAAE,CAAC,QAAQ,EAAE,uBAAuB,EAAE,QAAQ,CAAC,CAAC;KACjD,CAAC;AACH,CAAC"}
|
package/dist/lib/helpers.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { SubsequentArgsOfFunc } from "./useful-types";
|
|
2
2
|
export declare function clone<T>(value: T): T;
|
|
3
3
|
type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends ((x: infer I) => void) ? I : never;
|
|
4
4
|
type SelectorsForT<S, ST> = S extends {
|
|
@@ -31,4 +31,5 @@ export declare class TemporalLRUCache<K, V extends NonNullable<any> | undefined>
|
|
|
31
31
|
cancelTimeout(): void;
|
|
32
32
|
private beginTimeout;
|
|
33
33
|
}
|
|
34
|
+
export declare function potentialWpErrorToString(e: unknown): string | undefined;
|
|
34
35
|
export {};
|
package/dist/lib/helpers.js
CHANGED
|
@@ -4,7 +4,9 @@ exports.TemporalLRUCache = void 0;
|
|
|
4
4
|
exports.clone = clone;
|
|
5
5
|
exports.combineSelectors = combineSelectors;
|
|
6
6
|
exports.useAdoptedStyleSheet = useAdoptedStyleSheet;
|
|
7
|
+
exports.potentialWpErrorToString = potentialWpErrorToString;
|
|
7
8
|
const element_1 = require("@wordpress/element");
|
|
9
|
+
const useful_types_1 = require("./useful-types");
|
|
8
10
|
function clone(value) {
|
|
9
11
|
if (value === null || value === undefined) {
|
|
10
12
|
return value;
|
|
@@ -91,4 +93,7 @@ class TemporalLRUCache {
|
|
|
91
93
|
}
|
|
92
94
|
}
|
|
93
95
|
exports.TemporalLRUCache = TemporalLRUCache;
|
|
96
|
+
function potentialWpErrorToString(e) {
|
|
97
|
+
return (0, useful_types_1.is_wp_error)(e) ? e.message ?? e.code?.toString() : e?.toString();
|
|
98
|
+
}
|
|
94
99
|
//# sourceMappingURL=helpers.js.map
|
package/dist/lib/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/lib/helpers.ts"],"names":[],"mappings":";;;AAIA,sBAOC;AAmBD,4CASC;AAED,oDAgBC;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/lib/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,4 +84,10 @@ export type DbSource = {
|
|
|
84
84
|
value: string;
|
|
85
85
|
help?: string;
|
|
86
86
|
};
|
|
87
|
+
export interface WP_Error {
|
|
88
|
+
code?: string | number;
|
|
89
|
+
message?: string;
|
|
90
|
+
data?: unknown;
|
|
91
|
+
}
|
|
92
|
+
export declare function is_wp_error(value: unknown): value is WP_Error;
|
|
87
93
|
export {};
|
package/dist/lib/useful-types.js
CHANGED
|
@@ -2,10 +2,30 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isBlockJsonNativePropsConfig = isBlockJsonNativePropsConfig;
|
|
4
4
|
exports.arrayIsNotEmpty = arrayIsNotEmpty;
|
|
5
|
+
exports.is_wp_error = is_wp_error;
|
|
5
6
|
function isBlockJsonNativePropsConfig(thing) {
|
|
6
7
|
return typeof thing === 'object' && thing !== null && 'type' in thing && thing.type === "native";
|
|
7
8
|
}
|
|
8
9
|
function arrayIsNotEmpty(arr) {
|
|
9
10
|
return !!arr && arr.length > 0;
|
|
10
11
|
}
|
|
12
|
+
function is_wp_error(value) {
|
|
13
|
+
if (typeof value !== 'object' || !value) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
let hasDefinedProperty = false;
|
|
17
|
+
if ('code' in value) {
|
|
18
|
+
if (value.code !== undefined && typeof value.code !== 'string' && typeof value.code !== 'number') {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
hasDefinedProperty ||= value.code !== undefined;
|
|
22
|
+
}
|
|
23
|
+
if ('message' in value) {
|
|
24
|
+
if (value.message !== undefined && typeof value.message !== 'string') {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
hasDefinedProperty ||= value.message !== undefined;
|
|
28
|
+
}
|
|
29
|
+
return hasDefinedProperty;
|
|
30
|
+
}
|
|
11
31
|
//# sourceMappingURL=useful-types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useful-types.js","sourceRoot":"","sources":["../../src/lib/useful-types.ts"],"names":[],"mappings":";;AAkCA,oEAEC;AAGD,0CAEC;
|
|
1
|
+
{"version":3,"file":"useful-types.js","sourceRoot":"","sources":["../../src/lib/useful-types.ts"],"names":[],"mappings":";;AAkCA,oEAEC;AAGD,0CAEC;AAiBD,kCAkBC;AA1CD,SAAgB,4BAA4B,CAAC,KAAc;IAC1D,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AAClG,CAAC;AAGD,SAAgB,eAAe,CAAI,GAAuB;IACzD,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;AAChC,CAAC;AAiBD,SAAgB,WAAW,CAAC,KAAc;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClG,OAAO,KAAK,CAAC;QACd,CAAC;QACD,kBAAkB,KAAK,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC;IACjD,CAAC;IACD,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACtE,OAAO,KAAK,CAAC;QACd,CAAC;QACD,kBAAkB,KAAK,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC;IACpD,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC3B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@plaudit/gutenberg-api-extensions",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.93.0",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
5
5
|
"files": [
|
|
6
6
|
"./dist",
|
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
"@types/wordpress__block-editor": "^15.0.5",
|
|
27
27
|
"@types/wordpress__blocks": "^15.10.2",
|
|
28
28
|
"@wordpress/block-editor": "^15.16.0",
|
|
29
|
-
"@wordpress/blocks": "
|
|
30
|
-
"@wordpress/components": "
|
|
31
|
-
"@wordpress/compose": "
|
|
32
|
-
"@wordpress/core-data": "
|
|
33
|
-
"@wordpress/data": "
|
|
34
|
-
"@wordpress/editor": "
|
|
35
|
-
"@wordpress/element": "
|
|
36
|
-
"@wordpress/hooks": "
|
|
37
|
-
"@wordpress/i18n": "
|
|
38
|
-
"@wordpress/icons": "
|
|
29
|
+
"@wordpress/blocks": "15.16.0",
|
|
30
|
+
"@wordpress/components": "30.9.0",
|
|
31
|
+
"@wordpress/compose": "7.43.0",
|
|
32
|
+
"@wordpress/core-data": "7.43.0",
|
|
33
|
+
"@wordpress/data": "10.43.0",
|
|
34
|
+
"@wordpress/editor": "14.43.0",
|
|
35
|
+
"@wordpress/element": "6.43.0",
|
|
36
|
+
"@wordpress/hooks": "4.43.0",
|
|
37
|
+
"@wordpress/i18n": "6.16.0",
|
|
38
|
+
"@wordpress/icons": "12.1.0",
|
|
39
39
|
"framer-motion": "^12.38.0",
|
|
40
40
|
"html-react-parser": "^6.0.1",
|
|
41
41
|
"immer": "^11.1.4",
|
|
@@ -44,7 +44,7 @@ export type AsynchronousFormTokenFieldProps = AsynchronousFormTokenFieldPropsSin
|
|
|
44
44
|
export function AsynchronousFormTokenField(props: AsynchronousFormTokenFieldProps) {
|
|
45
45
|
const {help, expandOnFocus = false} = props;
|
|
46
46
|
|
|
47
|
-
const
|
|
47
|
+
const {value, setValue} = useMultiSingleConversionLayer(props.value, props.onChange, props.makeTokenFromSuggestion, props.multiple);
|
|
48
48
|
|
|
49
49
|
const {
|
|
50
50
|
currentTokens, dispatchValueUpdate, hasValidationError, isInitializing, isValidating, tokenTitleMappings
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import {Spinner, FormTokenField} from '@wordpress/components';
|
|
1
|
+
import {Spinner, FormTokenField, Modal} from '@wordpress/components';
|
|
2
2
|
import {useDebounce} from "@wordpress/compose";
|
|
3
3
|
import {type MapSelect, useSelect} from "@wordpress/data";
|
|
4
|
-
import {useCallback, useEffect, useMemo, useRef, useState} from "@wordpress/element";
|
|
4
|
+
import {memo, useCallback, useEffect, useMemo, useRef, useState} from "@wordpress/element";
|
|
5
5
|
import {__} from "@wordpress/i18n";
|
|
6
6
|
|
|
7
7
|
import type {SNPControlSlots} from "../blocks";
|
|
8
|
-
import type {TokenItem} from "../lib/useful-types";
|
|
9
8
|
import {packDisplayTokenText, unpackDisplayedTokenText, useImprovedTokenManager, ValidationState} from "./hooks/useImprovedTokenManager";
|
|
10
9
|
import {useMultiSingleConversionLayer} from "./hooks/useMultiSingleConversionLayer";
|
|
10
|
+
import {potentialWpErrorToString} from "../lib/helpers";
|
|
11
|
+
import {TokenItem} from "../lib/useful-types";
|
|
11
12
|
|
|
12
13
|
export {packDisplayTokenText, unpackDisplayedTokenText, ValidationState};
|
|
13
14
|
|
|
@@ -39,32 +40,39 @@ type ExtendedFormTokenFieldPropsMultiple = ExtendedFormTokenFieldPropsBase&{
|
|
|
39
40
|
};
|
|
40
41
|
export type ExtendedFormTokenFieldProps = ExtendedFormTokenFieldPropsSingle|ExtendedFormTokenFieldPropsMultiple;
|
|
41
42
|
|
|
43
|
+
const EMPTY_ARRAY: TokenItem[] = [];
|
|
42
44
|
export function ExtendedFormTokenField(props: ExtendedFormTokenFieldProps) {
|
|
43
45
|
const [debouncedInput, setDebouncedInput, setImmediateInput, input] = useDebouncedValue('');
|
|
46
|
+
const [hasBeenFocused, setHasBeenFocused] = useState(false);
|
|
44
47
|
|
|
45
48
|
const tokenTitleCacheRef = useRef<Map<TokenItem['value'], TokenItem['title']>|undefined>(undefined);
|
|
46
49
|
if (tokenTitleCacheRef.current === undefined) {
|
|
47
50
|
tokenTitleCacheRef.current = new Map();
|
|
48
51
|
}
|
|
49
52
|
|
|
50
|
-
const {rawSuggestions, isLoading, hasLoadingError} = useSelect((select, registry) => {
|
|
51
|
-
if (!debouncedInput && props.initialSuggestions !== undefined) {
|
|
52
|
-
return {rawSuggestions: props.initialSuggestions, isLoading: false};
|
|
53
|
+
const {rawSuggestions, isLoading, hasLoadingError, thrownLoadingError} = useSelect((select, registry) => {
|
|
54
|
+
if (!debouncedInput && (!hasBeenFocused || props.initialSuggestions !== undefined)) {
|
|
55
|
+
return {rawSuggestions: props.initialSuggestions ?? EMPTY_ARRAY, isLoading: false};
|
|
56
|
+
}
|
|
57
|
+
let res;
|
|
58
|
+
try {
|
|
59
|
+
res = props.suggestionQuery(debouncedInput, select, registry);
|
|
60
|
+
} catch (e) {
|
|
61
|
+
return {rawSuggestions: [], isLoading: false, hasLoadingError: true, thrownLoadingError: potentialWpErrorToString(e)};
|
|
53
62
|
}
|
|
54
|
-
const res = props.suggestionQuery(debouncedInput, select, registry);
|
|
55
63
|
if (res === undefined) {
|
|
56
|
-
return {rawSuggestions: props.initialSuggestions, isLoading: true};
|
|
64
|
+
return {rawSuggestions: props.initialSuggestions ?? EMPTY_ARRAY, isLoading: true};
|
|
57
65
|
}
|
|
58
66
|
|
|
59
67
|
return {rawSuggestions: res, isLoading: false, hasLoadingError: props.hasLoadingError?.(debouncedInput, select, registry)};
|
|
60
|
-
}, [debouncedInput, props.initialSuggestions, props.suggestionQuery]);
|
|
68
|
+
}, [debouncedInput, props.initialSuggestions, props.suggestionQuery, hasBeenFocused]);
|
|
61
69
|
const suggestions = useMemo(() => rawSuggestions?.map(packDisplayTokenText), [rawSuggestions]);
|
|
62
70
|
|
|
63
|
-
const
|
|
64
|
-
const {currentTokens, isValidating, updateComponentValue, tokenStatusCache}
|
|
71
|
+
const {value, setValue} = useMultiSingleConversionLayer(props.value, props.onChange, props.stringToTokenConverter, props.multiple);
|
|
72
|
+
const {currentTokens, isValidating, updateComponentValue, tokenStatusCache, thrownValidationError}
|
|
65
73
|
= useImprovedTokenManager(value, setValue, props.validationQuery, props.stringToTokenConverter, tokenTitleCacheRef.current);
|
|
66
74
|
|
|
67
|
-
// This is just a trick to avoid needing to
|
|
75
|
+
// This is just a trick to avoid needing to send an additional validation request when adding a token from the suggestions list
|
|
68
76
|
useMemo(() => {
|
|
69
77
|
if (rawSuggestions) {
|
|
70
78
|
for (const suggestion of rawSuggestions) {
|
|
@@ -76,8 +84,8 @@ export function ExtendedFormTokenField(props: ExtendedFormTokenFieldProps) {
|
|
|
76
84
|
}, [rawSuggestions, tokenStatusCache]);
|
|
77
85
|
|
|
78
86
|
const {hasValidationError} = useSelect((select, registry) => ({
|
|
79
|
-
hasValidationError: props.hasValidationError?.(select, registry)
|
|
80
|
-
}), [props.hasLoadingError, props.hasValidationError]);
|
|
87
|
+
hasValidationError: !!thrownValidationError || props.hasValidationError?.(select, registry)
|
|
88
|
+
}), [props.hasLoadingError, props.hasValidationError, thrownValidationError]);
|
|
81
89
|
|
|
82
90
|
const {help, expandOnFocus = false} = props;
|
|
83
91
|
|
|
@@ -96,18 +104,32 @@ export function ExtendedFormTokenField(props: ExtendedFormTokenFieldProps) {
|
|
|
96
104
|
__experimentalExpandOnFocus={expandOnFocus}
|
|
97
105
|
__experimentalShowHowTo={props.multiple !== false}
|
|
98
106
|
onInputChange={setDebouncedInput}
|
|
99
|
-
onFocus={useCallback(() =>
|
|
107
|
+
onFocus={useCallback(() => {
|
|
108
|
+
setHasBeenFocused(true);
|
|
109
|
+
setImmediateInput(input);
|
|
110
|
+
}, [input])}
|
|
100
111
|
__next40pxDefaultSize
|
|
101
112
|
__nextHasNoMarginBottom
|
|
102
113
|
/>
|
|
103
114
|
{help && <div><span className="components-form-token-field__help">{help}</span></div>}
|
|
104
|
-
{hasLoadingError && <
|
|
115
|
+
{hasLoadingError && <ErrorSummaryWithModal summary={<span className="components-form-token-field__help">{__("An Error Occurred While Loading Suggestions")}</span>} detail={thrownLoadingError} />}
|
|
105
116
|
{isLoading && <div><Spinner /><span className="components-form-token-field__help">{__("Updating Suggestions")}</span></div>}
|
|
106
|
-
{hasValidationError && <
|
|
117
|
+
{hasValidationError && <ErrorSummaryWithModal summary={<span className="components-form-token-field__help">{__("An Error Occurred While Validating")}</span>} detail={thrownValidationError} />}
|
|
107
118
|
{isValidating && <div><Spinner /><span className="components-form-token-field__help">{__("Validating")}</span></div>}
|
|
108
119
|
</>;
|
|
109
120
|
}
|
|
110
121
|
|
|
122
|
+
const ErrorSummaryWithModal = memo(({summary, detail}: {summary: ReactNode, detail: ReactNode}) => {
|
|
123
|
+
const [isOpen, setOpen] = useState(false);
|
|
124
|
+
const openModal = useCallback(() => setOpen(true), [setOpen]);
|
|
125
|
+
const closeModal = () => setOpen(false);
|
|
126
|
+
|
|
127
|
+
return <>
|
|
128
|
+
<div onClick={openModal} children={summary} />
|
|
129
|
+
{isOpen && <Modal title="Error Details" onRequestClose={closeModal} children={<pre>{detail}</pre>} />}
|
|
130
|
+
</>;
|
|
131
|
+
});
|
|
132
|
+
|
|
111
133
|
function useDebouncedValue<V>(defaultValue: V): [V, (value: V) => any, (value: V) => any, V] {
|
|
112
134
|
const [value, setValue] = useState(defaultValue);
|
|
113
135
|
const [debouncedValue, setDebouncedState] = useState(defaultValue);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {type MapSelect, useSelect} from "@wordpress/data";
|
|
2
2
|
import {useEffect, useMemo, useRef, useState} from "@wordpress/element";
|
|
3
3
|
|
|
4
|
+
import {potentialWpErrorToString} from "../../lib/helpers";
|
|
4
5
|
import type {TokenItem} from "../../lib/useful-types";
|
|
5
6
|
|
|
6
7
|
export function packDisplayTokenText(token: TokenItem) {
|
|
@@ -28,7 +29,8 @@ type ImprovedTokenManagerReturnType = {
|
|
|
28
29
|
currentTokens: TokenItem[];
|
|
29
30
|
isValidating: boolean;
|
|
30
31
|
updateComponentValue: (value: (((prevState: (string | TokenItem)[]) => (string|TokenItem)[])|(string|TokenItem)[])) => void;
|
|
31
|
-
tokenStatusCache: Map<TokenItem["value"], TokenItem["status"]
|
|
32
|
+
tokenStatusCache: Map<TokenItem["value"], TokenItem["status"]>;
|
|
33
|
+
thrownValidationError?: string;
|
|
32
34
|
};
|
|
33
35
|
|
|
34
36
|
export function useImprovedTokenManager(
|
|
@@ -47,7 +49,7 @@ export function useImprovedTokenManager(
|
|
|
47
49
|
}
|
|
48
50
|
|
|
49
51
|
const convertedTokens = useTokenConverter(componentValue, makeTokenFromString, tokenStatusCacheRef.current);
|
|
50
|
-
const {isValidating, validatedTokens} = useTokenValidator(convertedTokens, validationQuery, tokenStatusCacheRef.current)
|
|
52
|
+
const {isValidating, validatedTokens, thrownValidationError} = useTokenValidator(convertedTokens, validationQuery, tokenStatusCacheRef.current)
|
|
51
53
|
const titledTokens = useTokenTitleApplier(validatedTokens, tokenTitleCache);
|
|
52
54
|
|
|
53
55
|
useEffect(() => {
|
|
@@ -56,7 +58,7 @@ export function useImprovedTokenManager(
|
|
|
56
58
|
}
|
|
57
59
|
}, [titledTokens, isValidating]);
|
|
58
60
|
|
|
59
|
-
return {currentTokens: titledTokens, isValidating, updateComponentValue, tokenStatusCache: tokenStatusCacheRef.current};
|
|
61
|
+
return {currentTokens: titledTokens, isValidating, updateComponentValue, tokenStatusCache: tokenStatusCacheRef.current, thrownValidationError};
|
|
60
62
|
}
|
|
61
63
|
function syncTokenTitles(token: TokenItem, cache: Map<TokenItem['value'], TokenItem['title']>): TokenItem {
|
|
62
64
|
return {...token, title: cache.get(token.value) ?? addTokenTitleToCache(token, cache) ?? packDisplayTokenText(token)};
|
|
@@ -134,14 +136,19 @@ function useTokenValidator(
|
|
|
134
136
|
|
|
135
137
|
return useSelect((select, registry) => {
|
|
136
138
|
if (statusUpdatedConvertedTokens.some(token => token.status === undefined || token.status === ValidationState.Validating)) {
|
|
137
|
-
|
|
139
|
+
let res;
|
|
140
|
+
try {
|
|
141
|
+
res = validationQuery(statusUpdatedConvertedTokenValues, select, registry);
|
|
142
|
+
} catch (e) {
|
|
143
|
+
return {validatedTokens: statusUpdatedConvertedTokens, isValidating: false, thrownValidationError: potentialWpErrorToString(e)};
|
|
144
|
+
}
|
|
138
145
|
if (res !== undefined) {
|
|
139
146
|
const validTokens = new Map(res.map(token => [token.value, token]));
|
|
140
147
|
const validatedTokens = convertedTokens.map(token => validTokens.get(token.value) ?? {...token, status: ValidationState.Invalid});
|
|
141
148
|
for (const token of validatedTokens) {
|
|
142
149
|
tokenStatusCache.set(token.value, token.status);
|
|
143
150
|
}
|
|
144
|
-
return {validatedTokens
|
|
151
|
+
return {validatedTokens, isValidating: false};
|
|
145
152
|
} else {
|
|
146
153
|
return {validatedTokens: statusUpdatedConvertedTokens, isValidating: true};
|
|
147
154
|
}
|
|
@@ -2,16 +2,16 @@ import {useCallback, useMemo} from "@wordpress/element";
|
|
|
2
2
|
|
|
3
3
|
import type {TokenItem} from "../../lib/useful-types";
|
|
4
4
|
|
|
5
|
-
export type ValueConverter =
|
|
5
|
+
export type ValueConverter = {value: string[], setValue(value: TokenItem[]): void};
|
|
6
6
|
export function useMultiSingleConversionLayer(
|
|
7
7
|
value: string|string[]|undefined, onChange: ((tokens: string[]) => void)|((token: string) => void),
|
|
8
8
|
makeTokenFromSuggestion: (suggestion: string) => TokenItem, multiple = true
|
|
9
9
|
): ValueConverter {
|
|
10
|
-
return
|
|
11
|
-
useMemo(() => value === undefined ? [] : (Array.isArray(value) ? value : [value]), [value]),
|
|
12
|
-
useCallback(tokens => {
|
|
10
|
+
return {
|
|
11
|
+
value: useMemo(() => value === undefined ? [] : (Array.isArray(value) ? value : [value]), [value]),
|
|
12
|
+
setValue: useCallback(tokens => {
|
|
13
13
|
const bareTokens = tokens.filter(token => token.status === 'success').map(token => token.value);
|
|
14
14
|
onChange((multiple ? bareTokens : bareTokens[0]) as any);
|
|
15
15
|
}, [onChange, makeTokenFromSuggestion, multiple])
|
|
16
|
-
|
|
16
|
+
};
|
|
17
17
|
}
|
package/src/lib/helpers.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {useEffect, useRef} from "@wordpress/element";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import {is_wp_error, SubsequentArgsOfFunc} from "./useful-types";
|
|
4
4
|
|
|
5
5
|
export function clone<T>(value: T): T {
|
|
6
6
|
if (value === null || value === undefined) {
|
|
@@ -109,3 +109,7 @@ export class TemporalLRUCache<K, V extends NonNullable<any>|undefined> {
|
|
|
109
109
|
}, this.minDroppableAccessTime);
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
|
+
|
|
113
|
+
export function potentialWpErrorToString(e: unknown): string|undefined {
|
|
114
|
+
return is_wp_error(e) ? e.message ?? e.code?.toString() : (e?.toString() as string|undefined)
|
|
115
|
+
}
|
package/src/lib/useful-types.ts
CHANGED
|
@@ -50,3 +50,28 @@ type WPTaxonomyQueryFirstOrderClause = {include_children?: boolean, operator?: '
|
|
|
50
50
|
(({taxonomy: string}&({terms: number|number[], field?: 'term_id'}|{terms: string|string[], field: 'slug'|'name'}))|{taxonomy?: string, terms: number|number[], field: 'term_taxonomy_id'});
|
|
51
51
|
|
|
52
52
|
export type DbSource = {label: string, value: string, help?: string};
|
|
53
|
+
|
|
54
|
+
export interface WP_Error {
|
|
55
|
+
code?: string|number;
|
|
56
|
+
message?: string;
|
|
57
|
+
data?: unknown;
|
|
58
|
+
}
|
|
59
|
+
export function is_wp_error(value: unknown): value is WP_Error {
|
|
60
|
+
if (typeof value !== 'object' || !value) {
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
let hasDefinedProperty = false;
|
|
64
|
+
if ('code' in value) {
|
|
65
|
+
if (value.code !== undefined && typeof value.code !== 'string' && typeof value.code !== 'number') {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
hasDefinedProperty ||= value.code !== undefined;
|
|
69
|
+
}
|
|
70
|
+
if ('message' in value) {
|
|
71
|
+
if (value.message !== undefined && typeof value.message !== 'string') {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
hasDefinedProperty ||= value.message !== undefined;
|
|
75
|
+
}
|
|
76
|
+
return hasDefinedProperty;
|
|
77
|
+
}
|