Skip to content

Commit 224795d

Browse files
heswellheswell
committed
remove deprecated vuuModules
1 parent a357083 commit 224795d

File tree

12 files changed

+127
-113
lines changed

12 files changed

+127
-113
lines changed

‎vuu-ui/packages/vuu-data-test/src/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ export * from "./ArrayProxy";
22
export * from "./schemas";
33
export * from "./TickingArrayDataSource";
44
export * from "./vuu-row-generator";
5-
export * from "./vuu-modules";
65
export * from "./simul";
76
export * from "./basket";
87
export * from "./test";

‎vuu-ui/packages/vuu-data-test/src/vuu-modules.ts‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎vuu-ui/showcase/src/examples/Table/Misc.examples.tsx‎

Lines changed: 52 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
getSchema,
66
LocalDataSourceProvider,
77
SimulTableName,
8-
vuuModule,
98
} from "@vuu-ui/vuu-data-test";
109
import {
1110
DataSource,
@@ -118,7 +117,6 @@ const TableTemplate = ({
118117
schema: TableSchema;
119118
} & Partial<TableProps>) => {
120119
const { VuuDataSource } = useData();
121-
122120
const tableConfig = useMemo<TableConfig>(() => {
123121
return (
124122
config ?? {
@@ -268,20 +266,22 @@ export const VuuInstruments = () => {
268266
};
269267

270268
export const FlexLayoutTables = () => {
269+
const schema = getSchema("instruments");
270+
const { VuuDataSource } = useData();
271271
const tableConfig = useMemo<TableConfig>(() => {
272272
return {
273-
columns: getSchema("instruments").columns,
273+
columns: schema.columns,
274274
rowSeparators: true,
275275
zebraStripes: true,
276276
};
277-
}, []);
277+
}, [schema]);
278278

279279
const [ds1, ds2, ds3, ds4] = useMemo(() => {
280280
return [
281-
vuuModule("SIMUL").createDataSource("instruments"),
282-
vuuModule("SIMUL").createDataSource("instruments"),
283-
vuuModule("SIMUL").createDataSource("instruments"),
284-
vuuModule("SIMUL").createDataSource("instruments"),
281+
new VuuDataSource({ table: schema.table }),
282+
new VuuDataSource({ table: schema.table }),
283+
new VuuDataSource({ table: schema.table }),
284+
new VuuDataSource({ table: schema.table }),
285285
];
286286
}, []);
287287

@@ -314,20 +314,24 @@ export const FlexLayoutTables = () => {
314314
};
315315

316316
export const TableInLayoutWithContextPanel = () => {
317+
const schema = getSchema("instruments");
318+
const { VuuDataSource } = useData();
319+
317320
useMemo(() => {
318321
registerComponent("ColumnSettings", ColumnSettingsPanel, "view");
319322
registerComponent("TableSettings", TableSettingsPanel, "view");
320323
}, []);
321324
const tableConfig = useMemo<TableConfig>(() => {
322325
return {
323-
columns: getSchema("instruments").columns,
326+
columns: schema.columns,
324327
rowSeparators: true,
325328
zebraStripes: true,
326329
};
327330
}, []);
328-
const dataSource = useMemo(() => {
329-
return vuuModule("SIMUL").createDataSource("instruments");
330-
}, []);
331+
const dataSource = useMemo(
332+
() => new VuuDataSource({ table: schema.table }),
333+
[VuuDataSource, schema.table],
334+
);
331335

332336
return (
333337
<LayoutProvider>
@@ -349,16 +353,19 @@ export const CheckboxTableInLayoutWithContextPanel = () => {
349353
registerComponent("ColumnSettings", ColumnSettingsPanel, "view");
350354
registerComponent("TableSettings", TableSettingsPanel, "view");
351355
}, []);
356+
const { VuuDataSource } = useData();
357+
const schema = getSchema("instruments");
352358
const tableConfig = useMemo<TableConfig>(() => {
353359
return {
354-
columns: getSchema("instruments").columns,
360+
columns: schema.columns,
355361
rowSeparators: true,
356362
zebraStripes: true,
357363
};
358-
}, []);
359-
const dataSource = useMemo(() => {
360-
return vuuModule("SIMUL").createDataSource("instruments");
361-
}, []);
364+
}, [schema]);
365+
const dataSource = useMemo(
366+
() => new VuuDataSource({ table: schema.table }),
367+
[VuuDataSource, schema.table],
368+
);
362369

363370
return (
364371
<LayoutProvider>
@@ -393,9 +400,12 @@ export const TableInLayoutWithCustomContextPanel = () => {
393400
zebraStripes: true,
394401
};
395402
}, []);
396-
const dataSource = useMemo(() => {
397-
return vuuModule("SIMUL").createDataSource("instruments");
398-
}, []);
403+
const { VuuDataSource } = useData();
404+
const schema = getSchema("instruments");
405+
const dataSource = useMemo(
406+
() => new VuuDataSource({ table: schema.table }),
407+
[VuuDataSource, schema.table],
408+
);
399409

400410
const [{ component, expanded, title }, setContextState] = useState<{
401411
component?: LayoutJSON;
@@ -453,26 +463,32 @@ export const AutoTable = () => {
453463
zebraStripes: true,
454464
};
455465
}, []);
456-
const dataSource = useMemo(() => {
457-
return vuuModule("SIMUL").createDataSource("instruments");
458-
}, []);
466+
const { VuuDataSource } = useData();
467+
const schema = getSchema("instruments");
468+
const dataSource = useMemo(
469+
() => new VuuDataSource({ table: schema.table }),
470+
[VuuDataSource, schema.table],
471+
);
459472

460473
return (
461474
<Table config={tableConfig} dataSource={dataSource} renderBufferSize={0} />
462475
);
463476
};
464477

465478
export const AutoTableAsFlexChild = () => {
479+
const schema = getSchema("instruments");
466480
const tableConfig = useMemo<TableConfig>(() => {
467481
return {
468-
columns: getSchema("instruments").columns,
482+
columns: schema.columns,
469483
rowSeparators: true,
470484
zebraStripes: true,
471485
};
472486
}, []);
473-
const dataSource = useMemo(() => {
474-
return vuuModule("SIMUL").createDataSource("instruments");
475-
}, []);
487+
const { VuuDataSource } = useData();
488+
const dataSource = useMemo(
489+
() => new VuuDataSource({ table: schema.table }),
490+
[VuuDataSource, schema.table],
491+
);
476492

477493
return (
478494
<div
@@ -792,8 +808,15 @@ const SymbolHeader = (_: HeaderCellProps) => {
792808
registerComponent("symbol-header", SymbolHeader, "cell-renderer", {});
793809

794810
export const CustomColumnRenderer = () => {
811+
const { VuuDataSource } = useData();
812+
const schema = getSchema("instruments");
813+
const dataSource = useMemo(
814+
() => new VuuDataSource({ table: schema.table }),
815+
[VuuDataSource, schema.table],
816+
);
795817
const tableProps = useMemo<Pick<TableProps, "config" | "dataSource">>(() => {
796818
const tableName: SimulTableName = "instruments";
819+
797820
return {
798821
config: {
799822
columns: applyDefaultColumnConfig(
@@ -809,10 +832,9 @@ export const CustomColumnRenderer = () => {
809832
rowSeparators: true,
810833
zebraStripes: true,
811834
},
812-
dataSource:
813-
vuuModule<SimulTableName>("SIMUL").createDataSource(tableName),
835+
dataSource,
814836
};
815-
}, []);
837+
}, [dataSource]);
816838

817839
const onSelect = useCallback<TableRowSelectHandler>((row) => {
818840
console.log({ row });

‎vuu-ui/showcase/src/examples/Table/TEST.examples.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { Table, TableProps } from "@vuu-ui/vuu-table";
22
import { useMemo } from "react";
3-
import { TestTableName, getSchema, vuuModule } from "@vuu-ui/vuu-data-test";
3+
import { TestTableName, getSchema } from "@vuu-ui/vuu-data-test";
44
import { useVuuMenuActions } from "@vuu-ui/vuu-data-react";
55
import { SchemaColumn } from "@vuu-ui/vuu-data-types";
66
import { ColumnDescriptor } from "@vuu-ui/vuu-table-types";
77
import { DemoTableContainer } from "./DemoTableContainer";
88
import { ContextMenuProvider } from "@vuu-ui/vuu-context-menu";
9+
import { useData } from "@vuu-ui/vuu-utils";
910

1011
const extendColumnConfig = (
1112
columns: SchemaColumn[],
@@ -17,6 +18,7 @@ const TestTable = ({
1718
...props
1819
}: Partial<TableProps> & { tableName: TestTableName }) => {
1920
const schema = getSchema(tableName);
21+
const { VuuDataSource } = useData();
2022

2123
const tableProps = useMemo<Pick<TableProps, "config" | "dataSource">>(
2224
() => ({
@@ -28,9 +30,9 @@ const TestTable = ({
2830
rowSeparators: true,
2931
zebraStripes: true,
3032
},
31-
dataSource: vuuModule<TestTableName>("TEST").createDataSource(tableName),
33+
dataSource: new VuuDataSource({ table: schema.table }),
3234
}),
33-
[props, schema.columns, tableName],
35+
[VuuDataSource, props, schema],
3436
);
3537

3638
const { menuBuilder, menuActionHandler } = useVuuMenuActions({

‎vuu-ui/showcase/src/examples/Table/TableEditing.examples.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ const TableTemplate = ({
4343
tableName?: VuuTableName;
4444
}) => {
4545
const schema = getSchema(tableName);
46-
4746
const { VuuDataSource } = useData();
4847
const [dataSource, config] = useMemo<[DataSource, TableConfig]>(() => {
4948
const dataSource =

‎vuu-ui/showcase/src/examples/Table/TableLayout.examples.tsx‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
LocalDataSourceProvider,
44
SimulTableName,
55
getSchema,
6-
vuuModule,
76
} from "@vuu-ui/vuu-data-test";
87
import {
98
DataSource,
@@ -118,13 +117,16 @@ const InlineDrawer = ({
118117
position,
119118
peekaboo = false,
120119
}: InlineDrawerProps) => {
120+
const { VuuDataSource } = useData();
121+
const schema = getSchema("instruments");
122+
121123
const list = useRef<HTMLDivElement>(null);
122124
const [open, setOpen] = useState(false);
123125

124-
const dataSource = useMemo(() => {
125-
const ds = vuuModule("SIMUL").createDataSource("instruments");
126-
return ds;
127-
}, []);
126+
const dataSource = useMemo(
127+
() => new VuuDataSource({ table: schema.table }),
128+
[VuuDataSource, schema],
129+
);
128130

129131
const handleSelectionChange: SelectionChangeHandler = useCallback(
130132
(selection: Selection) => {
@@ -190,8 +192,10 @@ export const RightInlineDrawerPeek = () => (
190192
);
191193

192194
export const SingleHeadingRow = () => {
195+
const tableName: SimulTableName = "instruments";
196+
const schema = getSchema(tableName);
197+
const { VuuDataSource } = useData();
193198
const tableProps = useMemo<Pick<TableProps, "config" | "dataSource">>(() => {
194-
const tableName: SimulTableName = "instruments";
195199
return {
196200
// prettier-ignore
197201
config: {
@@ -207,8 +211,7 @@ export const SingleHeadingRow = () => {
207211
rowSeparators: true,
208212
zebraStripes: true,
209213
},
210-
dataSource:
211-
vuuModule<SimulTableName>("SIMUL").createDataSource(tableName),
214+
dataSource: new VuuDataSource({ table: schema.table }),
212215
};
213216
}, []);
214217

@@ -231,8 +234,11 @@ const SimpleCustomHeader = ({ ariaRole, ariaRowIndex }: BaseRowProps) => {
231234
};
232235

233236
export const CustomHeaderComponent = () => {
237+
const { VuuDataSource } = useData();
238+
const tableName: SimulTableName = "instruments";
239+
const schema = getSchema(tableName);
240+
234241
const tableProps = useMemo<Pick<TableProps, "config" | "dataSource">>(() => {
235-
const tableName: SimulTableName = "instruments";
236242
return {
237243
// prettier-ignore
238244
config: {
@@ -248,10 +254,9 @@ export const CustomHeaderComponent = () => {
248254
rowSeparators: true,
249255
zebraStripes: true,
250256
},
251-
dataSource:
252-
vuuModule<SimulTableName>("SIMUL").createDataSource(tableName),
257+
dataSource: new VuuDataSource({ table: schema.table }),
253258
};
254-
}, []);
259+
}, [VuuDataSource, schema]);
255260

256261
return (
257262
<Table

‎vuu-ui/showcase/src/examples/VuuFeatures/BasketSelector.examples.tsx‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ArrayDataSource } from "@vuu-ui/vuu-data-local";
2-
import { vuuModule } from "@vuu-ui/vuu-data-test";
3-
import { buildColumnMap } from "@vuu-ui/vuu-utils";
2+
import { getSchema } from "@vuu-ui/vuu-data-test";
3+
import { buildColumnMap, useData } from "@vuu-ui/vuu-utils";
44
import { Basket, BasketSelector } from "feature-basket-trading";
55
import { useCallback, useMemo, useState } from "react";
66

@@ -17,10 +17,13 @@ const testBaskets = [
1717
];
1818

1919
export const DefaultBasketSelector = () => {
20+
const schema = getSchema("basketTrading");
21+
const { VuuDataSource } = useData();
22+
2023
const [columnMap, dataSource] = useMemo(() => {
21-
const dataSource = vuuModule("BASKET").createDataSource(
22-
"basketTrading",
23-
) as ArrayDataSource;
24+
const dataSource = new VuuDataSource({
25+
table: schema.table,
26+
}) as ArrayDataSource;
2427
for (const [basketId, basketName, side, status] of testBaskets) {
2528
dataSource["insert"];
2629
console.log(
@@ -30,7 +33,7 @@ export const DefaultBasketSelector = () => {
3033
}
3134
dataSource.select([1]);
3235
return [buildColumnMap(dataSource.columns), dataSource];
33-
}, []);
36+
}, [VuuDataSource, schema]);
3437

3538
const [selectedBasket, setSelectedBasket] = useState(
3639
new Basket(dataSource.data[1], columnMap),

0 commit comments

Comments
 (0)