Skip to content

Commit b96d28b

Browse files
author
JeanRobin
committed
Revert "rename useDynamicJsonProperty to useDynamicDictProperty (#2777)"
This reverts commit f9d4cf4.
1 parent 339dbe5 commit b96d28b

File tree

12 files changed

+31
-33
lines changed

12 files changed

+31
-33
lines changed

doc/gui/extension/example_library/front-end/src/Dashboard.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
import React, { useMemo } from "react";
15-
import { useDynamicDictProperty } from "taipy-gui";
15+
import { useDynamicJsonProperty } from "taipy-gui";
1616

1717
import Plot from "react-plotly.js";
1818
import { Data, Layout } from "plotly.js";
@@ -25,8 +25,8 @@ interface DashboardProps {
2525
}
2626

2727
const Dashboard = (props: DashboardProps) => {
28-
const value = useDynamicDictProperty(props.data, props.defaultData || "", {} as Partial<Data>);
29-
const dashboardLayout = useDynamicDictProperty(props.layout, props.defaultLayout || "", {} as Partial<Layout>);
28+
const value = useDynamicJsonProperty(props.data, props.defaultData || "", {} as Partial<Data>);
29+
const dashboardLayout = useDynamicJsonProperty(props.layout, props.defaultLayout || "", {} as Partial<Layout>);
3030

3131
const data = useMemo(() => {
3232
if (Array.isArray(value)) {

frontend/taipy-gui/packaging/taipy-gui.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,16 +607,16 @@ export declare const useDynamicProperty: <T>(
607607
nullToDefault?: boolean
608608
) => T;
609609
/**
610-
* A React hook to manage a dynamic dict property (prev. useDynamicJsonProperty).
610+
* A React hook to manage a dynamic json property.
611611
*
612-
* A dynamic dict property is defined by a default property and a bound property.
612+
* A dynamic json property is defined by a default property and a bound property.
613613
* @typeParam T - The dynamic property type.
614614
* @param value - The bound value.
615615
* @param defaultValue - The default value.
616616
* @param defaultStatic - The default static value.
617617
* @returns The latest updated value.
618618
*/
619-
export declare const useDynamicDictProperty: <T>(
619+
export declare const useDynamicJsonProperty: <T>(
620620
value: string | undefined,
621621
defaultValue: string,
622622
defaultStatic: T

frontend/taipy-gui/src/components/Router.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* specific language governing permissions and limitations under the License.
1212
*/
1313

14-
import React, { useEffect, useMemo, useReducer, useState } from "react";
14+
import React, { useEffect, useReducer, useState } from "react";
1515
import Box from "@mui/material/Box";
1616
import CircularProgress from "@mui/material/CircularProgress";
1717
import CssBaseline from "@mui/material/CssBaseline";
@@ -119,10 +119,8 @@ const Router = () => {
119119
document.body.className = classes.join(" ");
120120
}, [themeClass]);
121121

122-
const contextStore = useMemo(() => ({ state, dispatch }), [state, dispatch]);
123-
124122
return (
125-
<TaipyContext.Provider value={contextStore}>
123+
<TaipyContext.Provider value={{ state, dispatch }}>
126124
<HelmetProvider>
127125
<ThemeProvider theme={state.theme}>
128126
<SnackbarProvider maxSnack={5}>

frontend/taipy-gui/src/components/Taipy/AutoLoadingTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
useClassNames,
4343
useDispatch,
4444
useDispatchRequestUpdateOnFirstRender,
45-
useDynamicDictProperty,
45+
useDynamicJsonProperty,
4646
useDynamicProperty,
4747
useFormatConfig,
4848
useModule,
@@ -226,7 +226,7 @@ const AutoLoadingTable = (props: TaipyTableProps) => {
226226
const active = useDynamicProperty(props.active, props.defaultActive, true);
227227
const editable = useDynamicProperty(props.editable, props.defaultEditable, false);
228228
const hover = useDynamicProperty(props.hoverText, props.defaultHoverText, undefined);
229-
const baseColumns = useDynamicDictProperty(props.columns, props.defaultColumns, defaultColumns);
229+
const baseColumns = useDynamicJsonProperty(props.columns, props.defaultColumns, defaultColumns);
230230

231231
const refresh = props.data?.__taipy_refresh !== undefined;
232232

frontend/taipy-gui/src/components/Taipy/Chart.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import {
4949
useClassNames,
5050
useDispatch,
5151
useDispatchRequestUpdateOnFirstRender,
52-
useDynamicDictProperty,
52+
useDynamicJsonProperty,
5353
useDynamicProperty,
5454
useModule,
5555
} from "../../utils/hooks";
@@ -364,7 +364,7 @@ const Chart = (props: ChartProp) => {
364364
const active = useDynamicProperty(props.active, props.defaultActive, true);
365365
const render = useDynamicProperty(props.render, props.defaultRender, true);
366366
const hover = useDynamicProperty(props.hoverText, props.defaultHoverText, undefined);
367-
const baseLayout = useDynamicDictProperty(props.layout, props.defaultLayout || "", emptyLayout);
367+
const baseLayout = useDynamicJsonProperty(props.layout, props.defaultLayout || "", emptyLayout);
368368
const title = useDynamicProperty(props.title, props.defaultTitle, "");
369369

370370
const dataVarNames = useMemo(() => (props.dataVarNames ? props.dataVarNames.split(";") : []), [props.dataVarNames]);
@@ -423,7 +423,7 @@ const Chart = (props: ChartProp) => {
423423
});
424424
}, [props]);
425425

426-
const config = useDynamicDictProperty(props.config, props.defaultConfig, defaultConfig);
426+
const config = useDynamicJsonProperty(props.config, props.defaultConfig, defaultConfig);
427427

428428
useEffect(() => {
429429
setDataKeys((oldDtKeys) => {

frontend/taipy-gui/src/components/Taipy/Metric.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Box from "@mui/material/Box";
1717
import Skeleton from "@mui/material/Skeleton";
1818
import Tooltip from "@mui/material/Tooltip";
1919
import { useTheme } from "@mui/material";
20-
import { useClassNames, useDynamicDictProperty, useDynamicProperty } from "../../utils/hooks";
20+
import { useClassNames, useDynamicJsonProperty, useDynamicProperty } from "../../utils/hooks";
2121
import { extractPrefix, extractSuffix, sprintfToD3Converter } from "../../utils/formatConversion";
2222
import { TaipyBaseProps, TaipyHoverProps } from "./utils";
2323
import { darkThemeTemplate } from "../../themes/darkThemeTemplate";
@@ -78,7 +78,7 @@ const Metric = (props: MetricProps) => {
7878
const threshold = useDynamicProperty(props.threshold, props.defaultThreshold, undefined);
7979
const delta = useDynamicProperty(props.delta, props.defaultDelta, undefined);
8080
const className = useClassNames(props.libClassName, props.dynamicClassName, props.className);
81-
const baseLayout = useDynamicDictProperty(props.layout, props.defaultLayout || "", defaultLayout);
81+
const baseLayout = useDynamicJsonProperty(props.layout, props.defaultLayout || "", defaultLayout);
8282
const hover = useDynamicProperty(props.hoverText, props.defaultHoverText, undefined);
8383
const theme = useTheme();
8484

frontend/taipy-gui/src/components/Taipy/PaginatedTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import {
4848
useClassNames,
4949
useDispatch,
5050
useDispatchRequestUpdateOnFirstRender,
51-
useDynamicDictProperty,
51+
useDynamicJsonProperty,
5252
useDynamicProperty,
5353
useFormatConfig,
5454
useModule,
@@ -138,7 +138,7 @@ const PaginatedTable = (props: TaipyPaginatedTableProps) => {
138138
const active = useDynamicProperty(props.active, props.defaultActive, true);
139139
const editable = useDynamicProperty(props.editable, props.defaultEditable, false);
140140
const hover = useDynamicProperty(props.hoverText, props.defaultHoverText, undefined);
141-
const baseColumns = useDynamicDictProperty(props.columns, props.defaultColumns, defaultColumns);
141+
const baseColumns = useDynamicJsonProperty(props.columns, props.defaultColumns, defaultColumns);
142142

143143
const [
144144
colsOrder,

frontend/taipy-gui/src/components/Taipy/Part.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import React, { ReactNode, useCallback, useContext, useMemo, useRef } from "react";
1515
import Box from "@mui/material/Box";
1616

17-
import { useClassNames, useDynamicDictProperty, useDynamicProperty, useModule } from "../../utils/hooks";
17+
import { useClassNames, useDynamicJsonProperty, useDynamicProperty, useModule } from "../../utils/hooks";
1818
import TaipyRendered from "../pages/TaipyRendered";
1919
import { expandSx, getCssSize, TaipyBaseProps } from "./utils";
2020
import { TaipyContext } from "../../context/taipyContext";
@@ -62,12 +62,12 @@ const Part = (props: PartProps) => {
6262

6363
const itemRef = useRef<HTMLDivElement>(null);
6464

65-
const dragData = useDynamicDictProperty(
65+
const dragData = useDynamicJsonProperty(
6666
props.dragData,
6767
props.defaultDragData || "",
6868
undefined as Record<string, unknown> | undefined
6969
);
70-
const dropData = useDynamicDictProperty(
70+
const dropData = useDynamicJsonProperty(
7171
props.dropData,
7272
props.defaultDropData || "",
7373
undefined as Record<string, unknown> | undefined

frontend/taipy-gui/src/components/Taipy/Selector.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import {
5656
useClassNames,
5757
useDispatch,
5858
useDispatchRequestUpdateOnFirstRender,
59-
useDynamicDictProperty,
59+
useDynamicJsonProperty,
6060
useDynamicProperty,
6161
useModule,
6262
} from "../../utils/hooks";
@@ -228,12 +228,12 @@ const Selector = (props: SelectorProps) => {
228228
const lovList = useLovListMemo(lov, defaultLov);
229229
const lovVarName = useMemo(() => getUpdateVar(updateVars, "lov"), [updateVars]);
230230

231-
const dragData = useDynamicDictProperty(
231+
const dragData = useDynamicJsonProperty(
232232
props.dragData,
233233
props.defaultDragData || "",
234234
undefined as Record<string, unknown> | undefined
235235
);
236-
const dropData = useDynamicDictProperty(
236+
const dropData = useDynamicJsonProperty(
237237
props.dropData,
238238
props.defaultDropData || "",
239239
undefined as Record<string, unknown> | undefined

frontend/taipy-gui/src/components/pages/TaipyRendered.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const TaipyRendered = (props: TaipyRenderedProps) => {
121121
setPageState({
122122
jsx: `<h1>${res ? res[0].replace("<br>", "<br/>") : "Unknown Error"}</h1><h2>No data fetched from backend from ${
123123
path === "/TaiPy_root_page" ? baseURL : baseURL + path
124-
}</h2><br/>${res && res[0] ? "" : error}`,
124+
}</h2><br/>${res[0] ? "" : error}`,
125125
});
126126
});
127127
}

0 commit comments

Comments
 (0)