Make FacetedPlotPropsWithRef

Author: chowington

src/plots/FacetedPlot.tsx

@@ -32,6 +32,11 @@ export interface FacetedPlotProps<D, P extends PlotProps<D>> {
   checkedLegendItems?: string[];
 }
 
+export interface FacetedPlotPropsWithRef<D, P extends PlotProps<D>>
+  extends FacetedPlotProps<D, P> {
+  facetedPlotRef?: Ref<FacetedPlotRef>;
+}
+
 function renderFacetedPlot<D, P extends PlotProps<D>>(
   props: FacetedPlotProps<D, P>,
   ref: Ref<FacetedPlotRef>
@@ -160,7 +165,7 @@ const makeFacetedPlotComponent = memoize(function <D, P extends PlotProps<D>>(
 });
 
 export default function FacetedPlot<D, P extends PlotProps<D>>(
-  props: FacetedPlotProps<D, P> & { facetedPlotRef?: Ref<FacetedPlotRef> }
+  props: FacetedPlotPropsWithRef<D, P>
 ) {
   const FacetedPlotComponent = makeFacetedPlotComponent<D, P>(props.component);
 

src/plots/facetedPlots/FacetedBarplot.tsx

@@ -1,5 +1,5 @@
 import Barplot, { BarplotProps } from '../Barplot';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { BarplotData } from '../../types/plots';
 
 export const defaultContainerStyles: BarplotProps['containerStyles'] = {
@@ -18,7 +18,7 @@ export const defaultSpacingOptions: BarplotProps['spacingOptions'] = {
 };
 
 type FacetedBarplotProps = Omit<
-  FacetedPlotProps<BarplotData, BarplotProps>,
+  FacetedPlotPropsWithRef<BarplotData, BarplotProps>,
   'component'
 >;
 

src/plots/facetedPlots/FacetedBoxplot.tsx

@@ -1,5 +1,5 @@
 import Boxplot, { BoxplotProps } from '../Boxplot';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { BoxplotData } from '../../types/plots';
 
 export const defaultContainerStyles: BoxplotProps['containerStyles'] = {
@@ -18,7 +18,7 @@ export const defaultSpacingOptions: BoxplotProps['spacingOptions'] = {
 };
 
 type FacetedBoxplotProps = Omit<
-  FacetedPlotProps<BoxplotData, BoxplotProps>,
+  FacetedPlotPropsWithRef<BoxplotData, BoxplotProps>,
   'component'
 >;
 

src/plots/facetedPlots/FacetedHeatmap.tsx

@@ -1,5 +1,5 @@
 import Heatmap, { HeatmapProps } from '../Heatmap';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { HeatmapData } from '../../types/plots';
 
 export const defaultContainerStyles: HeatmapProps['containerStyles'] = {
@@ -18,7 +18,7 @@ export const defaultSpacingOptions: HeatmapProps['spacingOptions'] = {
 };
 
 type FacetedHeatmapProps = Omit<
-  FacetedPlotProps<HeatmapData, HeatmapProps>,
+  FacetedPlotPropsWithRef<HeatmapData, HeatmapProps>,
   'component'
 >;
 

src/plots/facetedPlots/FacetedHistogram.tsx

@@ -1,5 +1,5 @@
 import Histogram, { HistogramProps } from '../Histogram';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { HistogramData } from '../../types/plots';
 
 export const defaultContainerStyles: HistogramProps['containerStyles'] = {
@@ -19,7 +19,7 @@ export const defaultSpacingOptions: HistogramProps['spacingOptions'] = {
 };
 
 type FacetedHistogramProps = Omit<
-  FacetedPlotProps<HistogramData, HistogramProps>,
+  FacetedPlotPropsWithRef<HistogramData, HistogramProps>,
   'component'
 >;
 

src/plots/facetedPlots/FacetedMosaicPlot.tsx

@@ -1,5 +1,5 @@
 import MosaicPlot, { MosaicPlotProps } from '../MosaicPlot';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { MosaicPlotData } from '../../types/plots';
 
 export const defaultContainerStyles: MosaicPlotProps['containerStyles'] = {
@@ -18,7 +18,7 @@ export const defaultSpacingOptions: MosaicPlotProps['spacingOptions'] = {
 };
 
 type FacetedMosaicPlotProps = Omit<
-  FacetedPlotProps<MosaicPlotData, MosaicPlotProps>,
+  FacetedPlotPropsWithRef<MosaicPlotData, MosaicPlotProps>,
   'component'
 >;
 

src/plots/facetedPlots/FacetedPiePlot.tsx

@@ -1,5 +1,5 @@
 import PiePlot, { PiePlotProps } from '../PiePlot';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { PiePlotData } from '../../types/plots';
 import { useCallback } from 'react';
 import { select } from 'd3';
@@ -20,7 +20,7 @@ export const defaultSpacingOptions: PiePlotProps['spacingOptions'] = {
 };
 
 type FacetedPiePlotProps = Omit<
-  FacetedPlotProps<PiePlotData, PiePlotProps>,
+  FacetedPlotPropsWithRef<PiePlotData, PiePlotProps>,
   'component'
 >;
 

src/plots/facetedPlots/FacetedXYPlot.tsx

@@ -1,5 +1,5 @@
 import XYPlot, { XYPlotProps } from '../XYPlot';
-import FacetedPlot, { FacetedPlotProps } from '../FacetedPlot';
+import FacetedPlot, { FacetedPlotPropsWithRef } from '../FacetedPlot';
 import { XYPlotData } from '../../types/plots';
 
 export const defaultContainerStyles: XYPlotProps['containerStyles'] = {
@@ -18,7 +18,7 @@ export const defaultSpacingOptions: XYPlotProps['spacingOptions'] = {
 };
 
 type FacetedXYPlotProps = Omit<
-  FacetedPlotProps<XYPlotData, XYPlotProps>,
+  FacetedPlotPropsWithRef<XYPlotData, XYPlotProps>,
   'component'
 >;