Skip to content

Commit c5d95e9

Browse files
alexcjohnsonalexcjohnson
committed
dep update for table
1 parent 09a3d27 commit c5d95e9

File tree

12 files changed

+2860
-2932
lines changed

12 files changed

+2860
-2932
lines changed

‎components/dash-table/demo/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class App extends Component<any, any> {
8888
return (newProps: any) => {
8989
Logger.debug('--->', newProps);
9090
this.setState((prevState: any) => ({
91-
tableProps: R.merge(prevState.tableProps, newProps)
91+
tableProps: R.mergeRight(prevState.tableProps, newProps)
9292
}));
9393
};
9494
});

‎components/dash-table/demo/AppMode.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function getBaseTableProps(mock: IDataMock): Partial<IProps> {
5757
return {
5858
id: 'table',
5959
columns: mock.columns.map((col: any) =>
60-
R.merge(col, {
60+
R.mergeRight(col, {
6161
name: col.name || col.id,
6262
on_change: {
6363
action: ChangeAction.None
@@ -119,7 +119,7 @@ function getDefaultState(generateData: Function = generateMockData): {
119119

120120
return {
121121
filter_query: '',
122-
tableProps: R.merge(getBaseTableProps(mock), {
122+
tableProps: R.mergeRight(getBaseTableProps(mock), {
123123
data: mock.data,
124124
editable: true,
125125
sort_action: TableAction.Native,
@@ -322,7 +322,7 @@ function getVirtualizedState() {
322322

323323
return {
324324
filter_query: '',
325-
tableProps: R.merge(getBaseTableProps(mock), {
325+
tableProps: R.mergeRight(getBaseTableProps(mock), {
326326
data: mock.data,
327327
editable: true,
328328
fill_width: false,

‎components/dash-table/package-lock.json

Lines changed: 2804 additions & 2876 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/dash-table/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
"maintainer": "Alex Johnson <[email protected]>",
4242
"license": "MIT",
4343
"devDependencies": {
44-
"@babel/cli": "^7.17.3",
45-
"@babel/core": "^7.17.4",
44+
"@babel/cli": "^7.17.6",
45+
"@babel/core": "^7.17.9",
4646
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
47-
"@babel/plugin-transform-regenerator": "^7.16.7",
47+
"@babel/plugin-transform-regenerator": "^7.17.9",
4848
"@babel/polyfill": "^7.12.1",
4949
"@babel/preset-env": "^7.16.11",
5050
"@babel/preset-react": "^7.16.7",
@@ -53,46 +53,46 @@
5353
"@fortawesome/free-solid-svg-icons": "^5.15.4",
5454
"@fortawesome/react-fontawesome": "^0.1.17",
5555
"@percy/storybook": "^3.3.1",
56-
"@plotly/dash-component-plugins": "^1.2.2",
56+
"@plotly/dash-component-plugins": "^1.2.3",
5757
"@plotly/webpack-dash-dynamic-import": "^1.3.0",
58-
"@storybook/builder-webpack5": "^6.4.19",
59-
"@storybook/cli": "^6.4.19",
60-
"@storybook/manager-webpack5": "^6.4.19",
61-
"@storybook/react": "^6.4.19",
58+
"@storybook/builder-webpack5": "^6.4.22",
59+
"@storybook/cli": "^6.4.22",
60+
"@storybook/manager-webpack5": "^6.4.22",
61+
"@storybook/react": "^6.4.22",
6262
"@storybook/semver": "^7.3.2",
63-
"@types/chai": "^4.3.0",
63+
"@types/chai": "^4.3.1",
6464
"@types/d3-format": "^3.0.1",
65-
"@types/mocha": "^8.2.3",
65+
"@types/mocha": "^9.1.0",
6666
"@types/papaparse": "^5.3.2",
67-
"@types/ramda": "0.27.42",
67+
"@types/ramda": "0.28.11",
6868
"@types/react": "^16.14.8",
6969
"@types/react-dom": "^16.9.13",
7070
"@types/react-select": "^4.0.16",
71-
"@typescript-eslint/eslint-plugin": "^5.7.0",
72-
"@typescript-eslint/parser": "^5.7.0",
73-
"babel-loader": "^8.2.3",
71+
"@typescript-eslint/eslint-plugin": "^5.19.0",
72+
"@typescript-eslint/parser": "^5.19.0",
73+
"babel-loader": "^8.2.4",
7474
"chai": "^4.3.6",
75-
"css-loader": "^6.6.0",
75+
"css-loader": "^6.7.1",
7676
"css.escape": "^1.5.1",
7777
"d3-format": "^3.1.0",
7878
"es-check": "^6.2.1",
7979
"eslint": "^7.30.0",
80-
"eslint-config-prettier": "^8.3.0",
80+
"eslint-config-prettier": "^8.5.0",
8181
"fast-isnumeric": "^1.1.4",
8282
"file-loader": "^6.2.0",
83-
"highlight.js": "^11.4.0",
84-
"karma": "^6.3.16",
85-
"karma-chrome-launcher": "^3.1.0",
83+
"highlight.js": "^11.5.1",
84+
"karma": "^6.3.18",
85+
"karma-chrome-launcher": "^3.1.1",
8686
"karma-mocha": "^2.0.1",
8787
"karma-typescript": "^5.5.3",
8888
"karma-webpack": "^5.0.0",
8989
"less": "^4.1.2",
9090
"less-loader": "^10.2.0",
91-
"mocha": "^9.2.0",
91+
"mocha": "^9.2.2",
9292
"npm-run-all": "^4.1.5",
93-
"papaparse": "^5.3.1",
94-
"prettier": "^2.5.1",
95-
"ramda": "^0.27.1",
93+
"papaparse": "^5.3.2",
94+
"prettier": "^2.6.2",
95+
"ramda": "^0.28.0",
9696
"raw-loader": "^4.0.2",
9797
"react": "^16.14.0",
9898
"react-docgen": "^5.4.0",
@@ -102,13 +102,13 @@
102102
"remarkable": "^2.0.1",
103103
"sheetclip": "^0.3.0",
104104
"style-loader": "^3.3.1",
105-
"ts-loader": "^9.2.6",
105+
"ts-loader": "^9.2.8",
106106
"typescript": "^4.3.5",
107-
"webpack": "^5.69.0",
107+
"webpack": "^5.72.0",
108108
"webpack-cli": "^4.9.2",
109109
"webpack-dev-server": "^3.11.2",
110110
"webpack-preprocessor": "^0.1.12",
111-
"xlsx": "^0.17.4"
111+
"xlsx": "^0.17.5"
112112
},
113113
"files": [
114114
"/dash_table/async-*{.js,.map}",

‎components/dash-table/src/dash-table/components/Table/controlledPropsHelper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ export default () => {
4747
uiViewport,
4848
virtualization,
4949
visibleColumns
50-
} = R.merge(props, state) as SanitizedAndDerivedProps & StandaloneState;
50+
} = R.mergeRight(props, state) as SanitizedAndDerivedProps &
51+
StandaloneState;
5152

5253
const virtual = getVirtual(
5354
visibleColumns,

‎components/dash-table/src/dash-table/dash/Sanitizer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ export default class Sanitizer {
154154
? props.selected_cells
155155
: NULL_SELECTED_CELLS;
156156

157-
return R.merge(props, {
157+
return R.mergeRight(props, {
158158
active_cell,
159159
columns,
160160
data,

‎components/dash-table/src/dash-table/derived/filter/map.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ function updateState(
9797
const globalFilter = getMultiColumnQueryString(asts, operator);
9898

9999
const rawGlobalFilter = R.map(
100-
ast => ast.query || '',
101-
R.filter<SingleColumnSyntaxTree>(ast => Boolean(ast), asts)
100+
ast => ast.query,
101+
R.filter<SingleColumnSyntaxTree>(ast => Boolean(ast?.query))(asts)
102102
).join(operator === FilterLogicalOperator.And ? ' && ' : ' || ');
103103

104104
setFilter(globalFilter, rawGlobalFilter, map);

‎components/dash-table/src/dash-table/derived/table/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function propsAndMapFn(
3535
) {
3636
const props = propsFn();
3737

38-
return R.merge(props, {
38+
return R.mergeRight(props, {
3939
map: props.workFilter.map,
4040
setFilter,
4141
toggleFilterOptions

‎components/dash-table/src/dash-table/syntax-tree/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ export const getMultiColumnQueryString = (
1818
R.map(
1919
ast => ast.toQueryString(),
2020
R.filter<SingleColumnSyntaxTree>(
21-
ast => ast && ast.isValid && ast.query !== '',
22-
asts
23-
)
21+
ast => Boolean(ast?.query) && ast.isValid
22+
)(asts)
2423
).join(` ${operator === FilterLogicalOperator.And ? '&&' : '||'} `);
2524

2625
export const getSingleColumnMap = (

‎components/dash-table/src/dash-table/syntax-tree/lexeme/relational.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const fnEval = (
6767
? fn(lhs.toString().toUpperCase(), rhs.toString().toUpperCase())
6868
: fn(lhs, rhs);
6969

70-
export const contains: IUnboundedLexeme = R.merge(
70+
export const contains: IUnboundedLexeme = R.mergeRight(
7171
{
7272
evaluate: relationalEvaluator(
7373
([lhs, rhs, relOp]) =>
@@ -84,7 +84,7 @@ export const contains: IUnboundedLexeme = R.merge(
8484
LEXEME_BASE
8585
);
8686

87-
export const equal: IUnboundedLexeme = R.merge(
87+
export const equal: IUnboundedLexeme = R.mergeRight(
8888
{
8989
evaluate: relationalEvaluator(([lhs, rhs, relOp]) =>
9090
equalEval(lhs, rhs, relOp)
@@ -97,7 +97,7 @@ export const equal: IUnboundedLexeme = R.merge(
9797
LEXEME_BASE
9898
);
9999

100-
export const greaterOrEqual: IUnboundedLexeme = R.merge(
100+
export const greaterOrEqual: IUnboundedLexeme = R.mergeRight(
101101
{
102102
evaluate: relationalEvaluator(([lhs, rhs, relOp]) =>
103103
fnEval((l, r) => l >= r, lhs, rhs, relOp)
@@ -110,7 +110,7 @@ export const greaterOrEqual: IUnboundedLexeme = R.merge(
110110
LEXEME_BASE
111111
);
112112

113-
export const greaterThan: IUnboundedLexeme = R.merge(
113+
export const greaterThan: IUnboundedLexeme = R.mergeRight(
114114
{
115115
evaluate: relationalEvaluator(([lhs, rhs, relOp]) =>
116116
fnEval((l, r) => l > r, lhs, rhs, relOp)
@@ -127,7 +127,7 @@ const DATE_OPTIONS: IDateValidation = {
127127
allow_YY: true
128128
};
129129

130-
export const dateStartsWith: IUnboundedLexeme = R.merge(
130+
export const dateStartsWith: IUnboundedLexeme = R.mergeRight(
131131
{
132132
evaluate: relationalEvaluator(([op, exp]) => {
133133
op = typeof op === 'number' ? op.toString() : op;
@@ -150,7 +150,7 @@ export const dateStartsWith: IUnboundedLexeme = R.merge(
150150
LEXEME_BASE
151151
);
152152

153-
export const lessOrEqual: IUnboundedLexeme = R.merge(
153+
export const lessOrEqual: IUnboundedLexeme = R.mergeRight(
154154
{
155155
evaluate: relationalEvaluator(([lhs, rhs, relOp]) =>
156156
fnEval((l, r) => l <= r, lhs, rhs, relOp)
@@ -163,7 +163,7 @@ export const lessOrEqual: IUnboundedLexeme = R.merge(
163163
LEXEME_BASE
164164
);
165165

166-
export const lessThan: IUnboundedLexeme = R.merge(
166+
export const lessThan: IUnboundedLexeme = R.mergeRight(
167167
{
168168
evaluate: relationalEvaluator(([lhs, rhs, relOp]) =>
169169
fnEval((l, r) => l < r, lhs, rhs, relOp)
@@ -176,7 +176,7 @@ export const lessThan: IUnboundedLexeme = R.merge(
176176
LEXEME_BASE
177177
);
178178

179-
export const notEqual: IUnboundedLexeme = R.merge(
179+
export const notEqual: IUnboundedLexeme = R.mergeRight(
180180
{
181181
evaluate: relationalEvaluator(([lhs, rhs, relOp]) =>
182182
fnEval((l, r) => l !== r, lhs, rhs, relOp)

0 commit comments

Comments
 (0)