From b903c9ce69999d152255c8c9ec53162f55fab587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= Date: Wed, 16 Jun 2021 17:56:30 +0200 Subject: [PATCH 1/2] fix(recommend): ignore `items` type in components --- packages/recommend-js/src/frequentlyBoughtTogether.tsx | 7 ++++++- packages/recommend-js/src/relatedProducts.tsx | 5 ++++- packages/recommend-react/src/FrequentlyBoughtTogether.tsx | 8 +++++++- packages/recommend-react/src/RelatedProducts.tsx | 6 +++++- packages/recommend-vdom/src/FrequentlyBoughtTogether.tsx | 5 +---- packages/recommend-vdom/src/RelatedProducts.tsx | 5 +---- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/packages/recommend-js/src/frequentlyBoughtTogether.tsx b/packages/recommend-js/src/frequentlyBoughtTogether.tsx index c48aa0ac..fa829880 100644 --- a/packages/recommend-js/src/frequentlyBoughtTogether.tsx +++ b/packages/recommend-js/src/frequentlyBoughtTogether.tsx @@ -6,7 +6,7 @@ import { } from '@algolia/recommend-core'; import { createFrequentlyBoughtTogetherComponent, - FrequentlyBoughtTogetherProps, + FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherVDomProps, } from '@algolia/recommend-vdom'; import { createElement, Fragment, h, render } from 'preact'; import { useEffect, useState } from 'preact/hooks'; @@ -40,6 +40,11 @@ function useFrequentlyBoughtTogether( return result; } +type FrequentlyBoughtTogetherProps< + TObject +> = GetFrequentlyBoughtTogetherProps & + Omit, 'items'>; + function FrequentlyBoughtTogether( props: FrequentlyBoughtTogetherProps ) { diff --git a/packages/recommend-js/src/relatedProducts.tsx b/packages/recommend-js/src/relatedProducts.tsx index 586dcd63..db74c3b1 100644 --- a/packages/recommend-js/src/relatedProducts.tsx +++ b/packages/recommend-js/src/relatedProducts.tsx @@ -6,7 +6,7 @@ import { } from '@algolia/recommend-core'; import { createRelatedProductsComponent, - RelatedProductsProps, + RelatedProductsProps as RelatedProductsVDomProps, } from '@algolia/recommend-vdom'; import { createElement, Fragment, h, render } from 'preact'; import { useEffect, useState } from 'preact/hooks'; @@ -36,6 +36,9 @@ function useRelatedProducts(props: GetRelatedProductsProps) { return result; } +type RelatedProductsProps = GetRelatedProductsProps & + Omit, 'items'>; + function RelatedProducts(props: RelatedProductsProps) { const { recommendations } = useRelatedProducts(props); diff --git a/packages/recommend-react/src/FrequentlyBoughtTogether.tsx b/packages/recommend-react/src/FrequentlyBoughtTogether.tsx index 1d788818..367ea6c4 100644 --- a/packages/recommend-react/src/FrequentlyBoughtTogether.tsx +++ b/packages/recommend-react/src/FrequentlyBoughtTogether.tsx @@ -1,6 +1,7 @@ +import { GetFrequentlyBoughtTogetherProps } from '@algolia/recommend-core'; import { createFrequentlyBoughtTogetherComponent, - FrequentlyBoughtTogetherProps, + FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherVDomProps, } from '@algolia/recommend-vdom'; import React, { createElement, Fragment } from 'react'; @@ -13,6 +14,11 @@ const UncontrolledFrequentlyBoughtTogether = createFrequentlyBoughtTogetherCompo } ); +type FrequentlyBoughtTogetherProps< + TObject +> = GetFrequentlyBoughtTogetherProps & + Omit, 'items'>; + export function FrequentlyBoughtTogether( props: FrequentlyBoughtTogetherProps ) { diff --git a/packages/recommend-react/src/RelatedProducts.tsx b/packages/recommend-react/src/RelatedProducts.tsx index f294bcf5..13b255c9 100644 --- a/packages/recommend-react/src/RelatedProducts.tsx +++ b/packages/recommend-react/src/RelatedProducts.tsx @@ -1,6 +1,7 @@ +import { GetRelatedProductsProps } from '@algolia/recommend-core'; import { createRelatedProductsComponent, - RelatedProductsProps, + RelatedProductsProps as RelatedProductsVDomProps, } from '@algolia/recommend-vdom'; import React, { createElement, Fragment } from 'react'; @@ -11,6 +12,9 @@ const UncontrolledRelatedProducts = createRelatedProductsComponent({ Fragment, }); +type RelatedProductsProps = GetRelatedProductsProps & + Omit, 'items'>; + export function RelatedProducts(props: RelatedProductsProps) { const { recommendations } = useRelatedProducts(props); diff --git a/packages/recommend-vdom/src/FrequentlyBoughtTogether.tsx b/packages/recommend-vdom/src/FrequentlyBoughtTogether.tsx index 69256476..76dd9b71 100644 --- a/packages/recommend-vdom/src/FrequentlyBoughtTogether.tsx +++ b/packages/recommend-vdom/src/FrequentlyBoughtTogether.tsx @@ -1,6 +1,4 @@ /** @jsx createElement */ -import { GetFrequentlyBoughtTogetherProps } from '@algolia/recommend-core'; - import { createDefaultChildrenComponent } from './DefaultChildren'; import { createDefaultFallbackComponent } from './DefaultFallback'; import { createDefaultHeaderComponent } from './DefaultHeader'; @@ -13,8 +11,7 @@ import { export type FrequentlyBoughtTogetherProps< TObject -> = GetFrequentlyBoughtTogetherProps & - RecommendComponentProps; +> = RecommendComponentProps; export function createFrequentlyBoughtTogetherComponent({ createElement, diff --git a/packages/recommend-vdom/src/RelatedProducts.tsx b/packages/recommend-vdom/src/RelatedProducts.tsx index 7bfaa272..53656aa6 100644 --- a/packages/recommend-vdom/src/RelatedProducts.tsx +++ b/packages/recommend-vdom/src/RelatedProducts.tsx @@ -1,6 +1,4 @@ /** @jsx createElement */ -import { GetRelatedProductsProps } from '@algolia/recommend-core'; - import { createDefaultChildrenComponent } from './DefaultChildren'; import { createDefaultFallbackComponent } from './DefaultFallback'; import { createDefaultHeaderComponent } from './DefaultHeader'; @@ -11,8 +9,7 @@ import { Renderer, } from './types'; -export type RelatedProductsProps = GetRelatedProductsProps & - RecommendComponentProps; +export type RelatedProductsProps = RecommendComponentProps; export function createRelatedProductsComponent({ createElement, From e95320836fcda0206607e213f1a85a1685e684f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= Date: Thu, 17 Jun 2021 09:42:32 +0200 Subject: [PATCH 2/2] fix: update VDOM type case --- packages/recommend-js/src/frequentlyBoughtTogether.tsx | 4 ++-- packages/recommend-js/src/relatedProducts.tsx | 4 ++-- packages/recommend-react/src/FrequentlyBoughtTogether.tsx | 4 ++-- packages/recommend-react/src/RelatedProducts.tsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/recommend-js/src/frequentlyBoughtTogether.tsx b/packages/recommend-js/src/frequentlyBoughtTogether.tsx index fa829880..191d14fb 100644 --- a/packages/recommend-js/src/frequentlyBoughtTogether.tsx +++ b/packages/recommend-js/src/frequentlyBoughtTogether.tsx @@ -6,7 +6,7 @@ import { } from '@algolia/recommend-core'; import { createFrequentlyBoughtTogetherComponent, - FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherVDomProps, + FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherVDOMProps, } from '@algolia/recommend-vdom'; import { createElement, Fragment, h, render } from 'preact'; import { useEffect, useState } from 'preact/hooks'; @@ -43,7 +43,7 @@ function useFrequentlyBoughtTogether( type FrequentlyBoughtTogetherProps< TObject > = GetFrequentlyBoughtTogetherProps & - Omit, 'items'>; + Omit, 'items'>; function FrequentlyBoughtTogether( props: FrequentlyBoughtTogetherProps diff --git a/packages/recommend-js/src/relatedProducts.tsx b/packages/recommend-js/src/relatedProducts.tsx index db74c3b1..5025a239 100644 --- a/packages/recommend-js/src/relatedProducts.tsx +++ b/packages/recommend-js/src/relatedProducts.tsx @@ -6,7 +6,7 @@ import { } from '@algolia/recommend-core'; import { createRelatedProductsComponent, - RelatedProductsProps as RelatedProductsVDomProps, + RelatedProductsProps as RelatedProductsVDOMProps, } from '@algolia/recommend-vdom'; import { createElement, Fragment, h, render } from 'preact'; import { useEffect, useState } from 'preact/hooks'; @@ -37,7 +37,7 @@ function useRelatedProducts(props: GetRelatedProductsProps) { } type RelatedProductsProps = GetRelatedProductsProps & - Omit, 'items'>; + Omit, 'items'>; function RelatedProducts(props: RelatedProductsProps) { const { recommendations } = useRelatedProducts(props); diff --git a/packages/recommend-react/src/FrequentlyBoughtTogether.tsx b/packages/recommend-react/src/FrequentlyBoughtTogether.tsx index 367ea6c4..4780eb65 100644 --- a/packages/recommend-react/src/FrequentlyBoughtTogether.tsx +++ b/packages/recommend-react/src/FrequentlyBoughtTogether.tsx @@ -1,7 +1,7 @@ import { GetFrequentlyBoughtTogetherProps } from '@algolia/recommend-core'; import { createFrequentlyBoughtTogetherComponent, - FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherVDomProps, + FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherVDOMProps, } from '@algolia/recommend-vdom'; import React, { createElement, Fragment } from 'react'; @@ -17,7 +17,7 @@ const UncontrolledFrequentlyBoughtTogether = createFrequentlyBoughtTogetherCompo type FrequentlyBoughtTogetherProps< TObject > = GetFrequentlyBoughtTogetherProps & - Omit, 'items'>; + Omit, 'items'>; export function FrequentlyBoughtTogether( props: FrequentlyBoughtTogetherProps diff --git a/packages/recommend-react/src/RelatedProducts.tsx b/packages/recommend-react/src/RelatedProducts.tsx index 13b255c9..24ee7d02 100644 --- a/packages/recommend-react/src/RelatedProducts.tsx +++ b/packages/recommend-react/src/RelatedProducts.tsx @@ -1,7 +1,7 @@ import { GetRelatedProductsProps } from '@algolia/recommend-core'; import { createRelatedProductsComponent, - RelatedProductsProps as RelatedProductsVDomProps, + RelatedProductsProps as RelatedProductsVDOMProps, } from '@algolia/recommend-vdom'; import React, { createElement, Fragment } from 'react'; @@ -13,7 +13,7 @@ const UncontrolledRelatedProducts = createRelatedProductsComponent({ }); type RelatedProductsProps = GetRelatedProductsProps & - Omit, 'items'>; + Omit, 'items'>; export function RelatedProducts(props: RelatedProductsProps) { const { recommendations } = useRelatedProducts(props);