@plaudit/gutenberg-api-extensions 2.85.0 → 2.86.0

package/src/blocks/hooks/useSuspendableOptions.ts

@@ -1,4 +1,5 @@
-import type {MapSelect} from "@wordpress/data";
+import {store as blockEditorStore} from "@wordpress/block-editor";
+import {MapSelect, useSelect} from "@wordpress/data";
 import {useMemo} from "@wordpress/element";
 import {applyFilters} from "@wordpress/hooks";
 
@@ -6,8 +7,6 @@ import type {CSNPConfig, PromisablePickableOptions, SuspendablePromisablePickabl
 import type {PickableOptions} from "../../controls";
 import {useNodeContext} from "../layout/NodeContext";
 import {isPromise, use} from "../../lib/suspense/promise-handlers";
-import {useSelectTyped} from "../../lib/use-select-typed";
-import {blockEditorStore} from "../utilities";
 
 type RefablePromisablePickableOptions<T> = T extends {options: PromisablePickableOptions<infer V, infer T>} ? PickableOptions<V, T> : never;
 export function isSuspendableOptions<V extends string|number, T extends object = {}>(thing: PromisablePickableOptions<V, T>|string): thing is SuspendablePromisablePickableOptions {
@@ -35,7 +34,7 @@ export function useSuspendableOptions<T extends CSNPConfig&{options: PromisableP
 		} else {
 			mapSelect = wrappedSelect => [null, wrappedSelect(blockEditorStore).getBlockName(blockClientId)];
 		}
-		const [attributes, blockName] = useSelectTyped(mapSelect, [blockClientId]);
+		const [attributes, blockName] = useSelect(mapSelect, [blockClientId]);
 
 		const potentiallyPromisedOptions = applyFilters('plaudit.gutenbergApiExtensions.simpleNativeProperties.suspendableOptions.resolve',
 			undefined, selectorInfo, {attributes, blockName});

package/src/blocks/utilities.ts

@@ -59,16 +59,6 @@ export function convertToSelectControlOptions(response: unknown): PairNormalized
 	}
 }
 
-type AddArgument<FirstArg, Fn extends (...args: any[]) => any> =
-	Fn extends (...arg: [...infer PrevArg]) => infer Return
-		? (...args: [FirstArg, ...PrevArg]) => Return
-		: never;
-type SelectorInflater<T extends {[name: string]: (...args: any[]) => any}> = {[name in keyof T]: AddArgument<any, T[name]>};
-export interface BlockEditorStoreDescriptor extends StoreDescriptor<ReduxStoreConfig<any, typeof BlockEditorActions, SelectorInflater<typeof BlockEditorSelectors>>> {
-	name: "core/block-editor";
-}
-export const blockEditorStore = realBlockEditorStore as BlockEditorStoreDescriptor;
-
 export function forStringOrStrings(stringOrStrings: string|string[], action: (string: string) => void) {
 	if (Array.isArray(stringOrStrings)) {
 		for (const string of stringOrStrings) {

package/src/controls/ExtendedFormTokenField.tsx

@@ -1,6 +1,6 @@
 import {Spinner, FormTokenField} from '@wordpress/components';
 import {useDebounce} from "@wordpress/compose";
-import {type MapSelect} from "@wordpress/data";
+import {type MapSelect, useSelect} from "@wordpress/data";
 import {useCallback, useEffect, useMemo, useRef, useState} from "@wordpress/element";
 import {__} from "@wordpress/i18n";
 
@@ -8,7 +8,6 @@ import type {SNPControlSlots} from "../blocks";
 import type {TokenItem} from "../lib/useful-types";
 import {packDisplayTokenText, unpackDisplayedTokenText, useImprovedTokenManager, ValidationState} from "./hooks/useImprovedTokenManager";
 import {useMultiSingleConversionLayer} from "./hooks/useMultiSingleConversionLayer";
-import {useSelectTyped} from "../lib/use-select-typed";
 
 export {packDisplayTokenText, unpackDisplayedTokenText, ValidationState};
 
@@ -48,7 +47,7 @@ export function ExtendedFormTokenField(props: ExtendedFormTokenFieldProps) {
 		tokenTitleCacheRef.current = new Map();
 	}
 
-	const {rawSuggestions, isLoading, hasLoadingError} = useSelectTyped((select, registry) => {
+	const {rawSuggestions, isLoading, hasLoadingError} = useSelect((select, registry) => {
 		if (!debouncedInput && props.initialSuggestions !== undefined) {
 			return {rawSuggestions: props.initialSuggestions, isLoading: false};
 		}
@@ -76,7 +75,7 @@ export function ExtendedFormTokenField(props: ExtendedFormTokenFieldProps) {
 		}
 	}, [rawSuggestions, tokenStatusCache]);
 
-	const {hasValidationError} = useSelectTyped((select, registry) => ({
+	const {hasValidationError} = useSelect((select, registry) => ({
 		hasValidationError: props.hasValidationError?.(select, registry)
 	}), [props.hasLoadingError, props.hasValidationError]);
 

package/src/controls/ExtendedTaxonomyPicker.tsx

@@ -1,10 +1,10 @@
 import {type BaseEntityRecords, store as coreStore, type Taxonomy} from "@wordpress/core-data";
+import {useSelect} from "@wordpress/data";
 import {useCallback, useMemo} from "@wordpress/element";
 
 import type {SNPControlSlots} from "../blocks";
 import type {TokenItem} from "../lib/useful-types";
 import {useOutputMemoizingFilter} from "./hooks/useOutputMemoizingFilter";
-import {useSelectTyped} from "../lib/use-select-typed";
 import {ExtendedFormTokenField, unpackDisplayedTokenText, ValidationState} from "./ExtendedFormTokenField";
 
 import type {ReactNode} from "react";
@@ -82,7 +82,7 @@ export function ExtendedTaxonomyPicker(props: ExtendedTaxonomyPickerProps) {
 }
 
 function useTaxonomiesFilteredByVisibility(visibility: ExtendedTaxonomyPickerProps['visibility']) {
-	const taxonomies = useSelectTyped(select => select(coreStore).getTaxonomies(), []);
+	const taxonomies = useSelect(select => select(coreStore).getTaxonomies(), []);
 	return useMemo(() => filterTaxonomiesByVisibility(taxonomies, visibility), [taxonomies, visibility]);
 }
 function makeTaxonomyVisibilityFilter(visibility: Parameters<typeof filterTaxonomiesByVisibility>[1]) {

package/src/controls/hooks/useImprovedTokenManager.ts

@@ -1,8 +1,7 @@
-import type {MapSelect} from "@wordpress/data";
+import {type MapSelect, useSelect} from "@wordpress/data";
 import {useEffect, useMemo, useRef, useState} from "@wordpress/element";
 
 import type {TokenItem} from "../../lib/useful-types";
-import {useSelectTyped} from "../../lib/use-select-typed";
 
 export function packDisplayTokenText(token: TokenItem) {
 	return `${token.title || token.value} (#${token.value})`;
@@ -133,7 +132,7 @@ function useTokenValidator(
 		return [res, res.map(token => token.value)];
 	}, [convertedTokens, tokenStatusCache]);
 
-	return useSelectTyped((select, registry) => {
+	return useSelect((select, registry) => {
 		if (statusUpdatedConvertedTokens.some(token => token.status === undefined || token.status === ValidationState.Validating)) {
 			const res = validationQuery(statusUpdatedConvertedTokenValues, select, registry);
 			if (res !== undefined) {

package/src/editor/post-featured-image.tsx

@@ -1,13 +1,11 @@
 import {Button, FocalPointPicker, Spinner} from "@wordpress/components";
 import type {Attachment} from "@wordpress/core-data";
-import {dispatch, select} from "@wordpress/data";
+import {dispatch, select, useSelect, type SelectFunction} from "@wordpress/data";
 import {PostFeaturedImageCheck, store as editorStore} from "@wordpress/editor";
 import {memo, useCallback, useEffect, useMemo, useState} from "@wordpress/element";
 import {addFilter, applyFilters} from "@wordpress/hooks";
 import {__} from "@wordpress/i18n";
 
-import {useSelectTyped} from "../lib/use-select-typed";
-
 import type {ComponentType} from "react";
 
 type MediaDetailsArgs = Omit<Attachment, 'media_details'>&{media_details: Record<string, any>};
@@ -46,7 +44,7 @@ function getMediaDetails(media: MediaDetailsArgs, postId: any) {
 }
 
 type Position = {x: number, y: number};
-function getLivePosition(selectFunction = select): Position {
+function getLivePosition(selectFunction: SelectFunction = select): Position {
 	const {x = 50, y = 50} = (selectFunction(editorStore).getEditedPostAttribute('meta')?.["plaudit_card-image_pos"] ?? {}) as Record<string, any>;
 	return {x: x / 100, y: y / 100};
 }
@@ -126,7 +124,7 @@ const NotInFocusMode = memo(({OriginalComponent, props, setInFocusMode}: NotInFo
 type InFocusModeProps = {mediaSourceUrl: string, props: Record<string, any>, restorablePosition: Position, setInFocusMode(value: boolean): void};
 const InFocusMode = memo(({mediaSourceUrl, props, restorablePosition, setInFocusMode}: InFocusModeProps) => {
 	// This assembly makes it so that we both get updates if something else triggers a position change while making the focus picker doesn't reset itself
-	const {x, y} = useSelectTyped(getLivePosition, []);
+	const {x, y} = useSelect(getLivePosition, []);
 	const [position, setPosition] = useState({x, y});
 	useEffect(() => setPosition(getLivePosition()), [x, y]);
 

package/src/index.ts

@@ -8,7 +8,6 @@ export * from "./controls";
 export * from "./editor/simple-gutenberg-endpoints-api";
 export * from "./lib/plaudit-icons";
 export * from "./lib/suspense";
-export * from "./lib/use-select-typed";
 export type * from "./lib/useful-types";
 
 export function installGutenbergExtensions() {

package/dist/lib/use-select-typed.d.ts

@@ -1,3 +0,0 @@
-import { select as baseSelect, type DataRegistry } from "@wordpress/data";
-export declare function useSelectTyped<R extends any>(mapSelect: (select: typeof baseSelect, registry: DataRegistry) => R, deps?: unknown[] | undefined): R;
-export declare function useSuspenseSelectTyped<R extends any>(mapSelect: (select: typeof baseSelect, registry: DataRegistry) => R, deps?: unknown[] | undefined): R;

package/dist/lib/use-select-typed.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSelectTyped = useSelectTyped;
-exports.useSuspenseSelectTyped = useSuspenseSelectTyped;
-const data_1 = require("@wordpress/data");
-function useSelectTyped(mapSelect, deps) {
-    return (0, data_1.useSelect)(mapSelect, deps);
-}
-function useSuspenseSelectTyped(mapSelect, deps) {
-    return (0, data_1.useSuspenseSelect)(mapSelect, deps);
-}
-//# sourceMappingURL=use-select-typed.js.map

package/dist/lib/use-select-typed.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-select-typed.js","sourceRoot":"","sources":["../../src/lib/use-select-typed.ts"],"names":[],"mappings":";;AAEA,wCAEC;AACD,wDAEC;AAPD,0CAAsH;AAEtH,SAAgB,cAAc,CAAgB,SAAmE,EAAE,IAA0B;IAC5I,OAAO,IAAA,gBAAS,EAAC,SAAiC,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AACD,SAAgB,sBAAsB,CAAgB,SAAmE,EAAE,IAA0B;IACpJ,OAAO,IAAA,wBAAiB,EAAC,SAAiC,EAAE,IAAa,CAAC,CAAC;AAC5E,CAAC"}

package/src/lib/use-select-typed.ts

@@ -1,8 +0,0 @@
-import {select as baseSelect, type DataRegistry, type MapSelect, useSelect, useSuspenseSelect} from "@wordpress/data";
-
-export function useSelectTyped<R extends any>(mapSelect: (select: typeof baseSelect, registry: DataRegistry) => R, deps?: unknown[]|undefined): R {
-	return useSelect(mapSelect as unknown as MapSelect, deps);
-}
-export function useSuspenseSelectTyped<R extends any>(mapSelect: (select: typeof baseSelect, registry: DataRegistry) => R, deps?: unknown[]|undefined): R {
-	return useSuspenseSelect(mapSelect as unknown as MapSelect, deps as any[]);
-}