diff --git a/package-lock.json b/package-lock.json index 31d351e45d..11de19e0dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@gravity-ui/app-layout": "^2.1.0", "@gravity-ui/browserslist-config": "^4.3.0", "@gravity-ui/chartkit": "^7.37.4", - "@gravity-ui/dashkit": "^9.3.1", + "@gravity-ui/dashkit": "^10.0.0", "@gravity-ui/date-utils": "^2.5.6", "@gravity-ui/expresskit": "^2.11.1", "@gravity-ui/gateway": "^4.10.4", @@ -5779,9 +5779,9 @@ } }, "node_modules/@gravity-ui/dashkit": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@gravity-ui/dashkit/-/dashkit-9.3.1.tgz", - "integrity": "sha512-9nFc8Ad+rP9Fubtcv1rM9kOlKupct+efuxH3Hjg4UV1FhLsDATvg5HI7jnDka26hGfrEY46aLsP76SgoIyJX7A==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@gravity-ui/dashkit/-/dashkit-10.0.0.tgz", + "integrity": "sha512-xFCoVIY6+51QMN05lOC9p/NYVhc2fVrM+vxrEVlUNn2e5n5omvpJdnHNp1RvTcrywPI4PGSyStOm4YpmGlpFDw==", "license": "MIT", "dependencies": { "@bem-react/classname": "^1.6.0", diff --git a/package.json b/package.json index c07a0013bb..e4cbea77ba 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@gravity-ui/app-layout": "^2.1.0", "@gravity-ui/browserslist-config": "^4.3.0", "@gravity-ui/chartkit": "^7.37.4", - "@gravity-ui/dashkit": "^9.3.1", + "@gravity-ui/dashkit": "^10.0.0", "@gravity-ui/date-utils": "^2.5.6", "@gravity-ui/expresskit": "^2.11.1", "@gravity-ui/gateway": "^4.10.4", @@ -271,4 +271,4 @@ "optionalDependencies": { "fsevents": "^2.3.2" } -} \ No newline at end of file +} diff --git a/src/ui/components/DashKit/plugins/Widget/WidgetPlugin.tsx b/src/ui/components/DashKit/plugins/Widget/WidgetPlugin.tsx index e13b4aeff1..1bc70d1674 100644 --- a/src/ui/components/DashKit/plugins/Widget/WidgetPlugin.tsx +++ b/src/ui/components/DashKit/plugins/Widget/WidgetPlugin.tsx @@ -34,7 +34,7 @@ const widgetPlugin: PluginWidget = { }, renderer: function Wrapper( props: Props, - forwardedRef: React.RefObject, + forwardedRef?: React.RefCallback, ) { const rootNodeRef = React.useRef(null); const {onWidgetLoadData} = useWidgetContext({ diff --git a/src/ui/components/DashKit/plugins/Widget/types.ts b/src/ui/components/DashKit/plugins/Widget/types.ts index 48fc8b1481..ec41c10176 100644 --- a/src/ui/components/DashKit/plugins/Widget/types.ts +++ b/src/ui/components/DashKit/plugins/Widget/types.ts @@ -35,7 +35,9 @@ export type WidgetPluginData = ConfigItem['data']; export type WidgetPluginDataWithTabs = ConfigItemWithTabs['data'] & {tabs: Array}; export type WidgetPluginProps = Omit & { - forwardedRef: React.RefObject; + forwardedRef?: + | React.RefObject + | React.RefCallback; data: WidgetPluginDataWithTabs | WidgetPluginData; getMarkdown?: (props: {text: string}) => Promise<{result: string; meta?: object}>; debouncedAdjustWidgetLayout: DebouncedFunc<(props: AdjustWidgetLayoutProps) => void>; diff --git a/src/ui/components/Widgets/Chart/types.ts b/src/ui/components/Widgets/Chart/types.ts index 7b70d1a06c..eb3d43cff6 100644 --- a/src/ui/components/Widgets/Chart/types.ts +++ b/src/ui/components/Widgets/Chart/types.ts @@ -191,7 +191,11 @@ export type ChartWithProviderProps = ChartsProps & { dataProvider: ChartKitDataProvider; }; -type ChartRefProp = {forwardedRef: React.RefObject}; +type ChartRefProp = { + forwardedRef?: + | React.RefObject + | React.RefCallback; +}; export type ChartWrapperWithRefProps = | ChartWidgetProviderPropsWithRefProps diff --git a/src/ui/libs/DatalensChartkit/components/ChartKitBase/types.ts b/src/ui/libs/DatalensChartkit/components/ChartKitBase/types.ts index 5686e3f73c..366f824934 100644 --- a/src/ui/libs/DatalensChartkit/components/ChartKitBase/types.ts +++ b/src/ui/libs/DatalensChartkit/components/ChartKitBase/types.ts @@ -87,9 +87,10 @@ export type ChartKitBaseWrapperProps = ChartsProps & { }; export type ChartKitBaseWrapperWithRefProps = ChartKitBaseWrapperProps & { - forwardedRef: + forwardedRef?: | React.RefObject - | React.MutableRefObject; + | React.MutableRefObject + | React.RefCallback; }; export interface ChartKitWrapperState {