@prismicio/react 2.4.1 → 2.5.0-alpha.0

package/src/PrismicLink.tsx

@@ -138,30 +138,36 @@ const _PrismicLink = <
 
 	if (!__PRODUCTION__) {
 		if ("field" in props && props.field) {
-			if (
-				!("link_type" in props.field) ||
-				!("url" in props.field || "id" in props.field)
-			) {
+			if (!props.field.link_type) {
 				console.error(
 					`[PrismicLink] This "field" prop value caused an error to be thrown.\n`,
 					props.field,
 				);
 				throw new Error(
-					`[PrismicLink] The provided field is missing required properties to properly render a link. The link may not render. For more details, see ${devMsg(
+					`[PrismicLink] The provided field is missing required properties to properly render a link. The link will not render. For more details, see ${devMsg(
+						"missing-link-properties",
+					)}`,
+				);
+			} else if (
+				!(
+					prismicH.isFilled.link(props.field) &&
+					("url" in props.field || "id" in props.field)
+				)
+			) {
+				console.warn(
+					`[PrismicLink] The provided field is missing required properties to properly render a link. The link may not render correctly. For more details, see ${devMsg(
 						"missing-link-properties",
 					)}`,
+					props.field,
 				);
 			}
 		} else if ("document" in props && props.document) {
 			if (!("url" in props.document || "id" in props.document)) {
-				console.error(
-					`[PrismicLink] This "document" prop value caused an error to be thrown.\n`,
-					props.document,
-				);
-				throw new Error(
-					`[PrismicLink] The provided document is missing required properties to properly render a link. The link may not render. For more details, see ${devMsg(
+				console.warn(
+					`[PrismicLink] The provided document is missing required properties to properly render a link. The link may not render correctly. For more details, see ${devMsg(
 						"missing-link-properties",
 					)}`,
+					props.document,
 				);
 			}
 		}

package/src/SliceZone.tsx

@@ -26,6 +26,7 @@ type ExtractSliceType<Slice extends SliceLike> = Slice extends SliceLikeRestV2
  */
 export type SliceLikeRestV2<SliceType extends string = string> = {
 	slice_type: prismicT.Slice<SliceType>["slice_type"];
+	slice_id?: string;
 };
 
 /**
@@ -59,7 +60,8 @@ export type SliceLike<SliceType extends string = string> =
  *
  * @typeParam TSlice - The type(s) of a Slice in the Slice Zone.
  */
-export type SliceZoneLike<TSlice extends SliceLike> = readonly TSlice[];
+export type SliceZoneLike<TSlice extends SliceLike = SliceLike> =
+	readonly TSlice[];
 
 /**
  * React props for a component rendering content from a Prismic Slice using the
@@ -70,7 +72,8 @@ export type SliceZoneLike<TSlice extends SliceLike> = readonly TSlice[];
  *   available to all Slice components.
  */
 export type SliceComponentProps<
-	TSlice extends SliceLike = SliceLike,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	TSlice extends SliceLike = any,
 	TContext = unknown,
 > = {
 	/**
@@ -105,7 +108,8 @@ export type SliceComponentProps<
  * @typeParam TContext - Arbitrary data made available to all Slice components.
  */
 export type SliceComponentType<
-	TSlice extends SliceLike = SliceLike,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	TSlice extends SliceLike = any,
 	TContext = unknown,
 > = React.ComponentType<SliceComponentProps<TSlice, TContext>>;
 
@@ -113,6 +117,8 @@ export type SliceComponentType<
  * A record of Slice types mapped to a React component. The component will be
  * rendered for each instance of its Slice.
  *
+ * @deprecated This type is no longer used by `@prismicio/react`. Prefer using
+ *   `Record<string, SliceComponentType<any>>` instead.
  * @typeParam TSlice - The type(s) of a Slice in the Slice Zone.
  * @typeParam TContext - Arbitrary data made available to all Slice components.
  */
@@ -169,7 +175,10 @@ export const TODOSliceComponent = __PRODUCTION__
 /**
  * Arguments for a `<SliceZone>` `resolver` function.
  */
-type SliceZoneResolverArgs<TSlice extends SliceLike = SliceLike> = {
+type SliceZoneResolverArgs<
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	TSlice extends SliceLike = any,
+> = {
 	/**
 	 * The Slice to resolve to a React component.
 	 */
@@ -198,11 +207,17 @@ type SliceZoneResolverArgs<TSlice extends SliceLike = SliceLike> = {
  * @returns The React component to render for a Slice.
  */
 export type SliceZoneResolver<
-	TSlice extends SliceLike = SliceLike,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	TSlice extends SliceLike = any,
 	TContext = unknown,
-> = (
-	args: SliceZoneResolverArgs<TSlice>,
-) => SliceComponentType<TSlice, TContext> | undefined | null;
+> = (args: SliceZoneResolverArgs<TSlice>) =>
+	| SliceComponentType<
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			any,
+			TContext
+	  >
+	| undefined
+	| null;
 
 /**
  * React props for the `<SliceZone>` component.
@@ -210,19 +225,17 @@ export type SliceZoneResolver<
  * @typeParam TSlice - The type(s) of a Slice in the Slice Zone.
  * @typeParam TContext - Arbitrary data made available to all Slice components.
  */
-export type SliceZoneProps<
-	TSlice extends SliceLike = SliceLike,
-	TContext = unknown,
-> = {
+export type SliceZoneProps<TContext = unknown> = {
 	/**
 	 * List of Slice data from the Slice Zone.
 	 */
-	slices?: SliceZoneLike<TSlice>;
+	slices?: SliceZoneLike;
 
 	/**
 	 * A record mapping Slice types to React components.
 	 */
-	components?: SliceZoneComponents<TSlice, TContext>;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	components?: Record<string, SliceComponentType<any, TContext>>;
 
 	/**
 	 * A function that determines the rendered React component for each Slice in
@@ -234,13 +247,15 @@ export type SliceZoneProps<
 	 *
 	 * @returns The React component to render for a Slice.
 	 */
-	resolver?: SliceZoneResolver<TSlice, TContext>;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	resolver?: SliceZoneResolver<any, TContext>;
 
 	/**
 	 * The React component rendered if a component mapping from the `components`
 	 * prop cannot be found.
 	 */
-	defaultComponent?: SliceComponentType<TSlice, TContext>;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	defaultComponent?: SliceComponentType<any, TContext>;
 
 	/**
 	 * Arbitrary data made available to all Slice components.
@@ -263,19 +278,19 @@ export type SliceZoneProps<
  *
  * @see Learn about Prismic Slices and Slice Zones {@link https://prismic.io/docs/core-concepts/slices}
  */
-export const SliceZone = <TSlice extends SliceLike, TContext>({
+export const SliceZone = <TContext,>({
 	slices = [],
-	components = {} as SliceZoneComponents<TSlice, TContext>,
+	components = {},
 	resolver,
 	defaultComponent = TODOSliceComponent,
 	context = {} as TContext,
-}: SliceZoneProps<TSlice, TContext>): JSX.Element => {
+}: SliceZoneProps<TContext>): JSX.Element => {
 	const renderedSlices = React.useMemo(() => {
 		return slices.map((slice, index) => {
 			const type = "slice_type" in slice ? slice.slice_type : slice.type;
 
-			let Comp = (components[type as keyof typeof components] ||
-				defaultComponent) as SliceComponentType<TSlice, TContext>;
+			let Comp =
+				components[type as keyof typeof components] || defaultComponent;
 
 			// TODO: Remove `resolver` in v3 in favor of `components`.
 			if (resolver) {
@@ -286,11 +301,14 @@ export const SliceZone = <TSlice extends SliceLike, TContext>({
 				});
 
 				if (resolvedComp) {
-					Comp = resolvedComp;
+					Comp = resolvedComp as typeof Comp;
 				}
 			}
 
-			const key = `${index}-${JSON.stringify(slice)}`;
+			const key =
+				"slice_id" in slice && slice.slice_id
+					? slice.slice_id
+					: `${index}-${JSON.stringify(slice)}`;
 
 			return (
 				<Comp

package/src/index.ts

@@ -32,6 +32,8 @@ export { SliceZone, TODOSliceComponent } from "./SliceZone";
 export type {
 	SliceComponentProps,
 	SliceComponentType,
+	SliceLikeRestV2,
+	SliceLikeGraphQL,
 	SliceLike,
 	SliceZoneComponents,
 	SliceZoneLike,