Deprecated Ramda function

plotly · Oct 9, 2019 · aa313da · aa313da
1 parent 3066b8b
commit aa313da
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 45 deletions.
diff --git a/demo/App.tsx b/demo/App.tsx
@@ -78,7 +78,7 @@ class App extends Component<any, any> {
         return (newProps: any) => {
             Logger.debug('--->', newProps);
             this.setState((prevState: any) => ({
-                tableProps: R.merge(prevState.tableProps, newProps)
+                tableProps: R.mergeRight(prevState.tableProps, newProps)
             }));
         };
     });

diff --git a/demo/AppMode.ts b/demo/AppMode.ts
@@ -53,7 +53,7 @@ export const BasicModes = [
 function getBaseTableProps(mock: IDataMock): Partial<IProps> {
     return {
         id: 'table',
-        columns: mock.columns.map((col: any) => R.merge(col, {
+        columns: mock.columns.map((col: any) => R.mergeRight(col, {
             name: col.name || col.id,
             on_change: {
                 action: ChangeAction.None
@@ -107,7 +107,7 @@ function getDefaultState(
 
     return {
         filter_query: '',
-        tableProps: R.merge(getBaseTableProps(mock), {
+        tableProps: R.mergeRight(getBaseTableProps(mock), {
             data: mock.data,
             editable: true,
             sort_action: TableAction.Native,
@@ -258,7 +258,7 @@ function getVirtualizedState() {
 
     return {
         filter_query: '',
-        tableProps: R.merge(getBaseTableProps(mock), {
+        tableProps: R.mergeRight(getBaseTableProps(mock), {
             data: mock.data,
             editable: true,
             fill_width: false,

diff --git a/src/dash-table/components/CellFactory.tsx b/src/dash-table/components/CellFactory.tsx
@@ -210,7 +210,7 @@ export default class CellFactory {
     ) => {
         return React.cloneElement(wrapper, {
             children: [content],
-            style: R.merge(style, { borderBottom, borderLeft, borderRight, borderTop })
+            style: R.mergeRight(style, { borderBottom, borderLeft, borderRight, borderTop })
         });
     });
 

diff --git a/src/dash-table/components/Table/controlledPropsHelper.ts b/src/dash-table/components/Table/controlledPropsHelper.ts
@@ -47,7 +47,7 @@ export default () => {
             uiViewport,
             virtualization,
             visibleColumns
-        } = R.merge(props, state) as (SanitizedAndDerivedProps & StandaloneState);
+        } = R.mergeRight(props, state) as (SanitizedAndDerivedProps & StandaloneState);
 
         const virtual = getVirtual(
             visibleColumns,

diff --git a/src/dash-table/dash/Sanitizer.ts b/src/dash-table/dash/Sanitizer.ts
@@ -87,7 +87,7 @@ export default class Sanitizer {
             headerFormat = ExportHeaders.Ids;
         }
 
-        return R.merge(props, {
+        return R.mergeRight(props, {
             columns,
             export_headers: headerFormat,
             fixed_columns: getFixedColumns(props.fixed_columns, props.row_deletable, props.row_selectable),

diff --git a/src/dash-table/derived/cell/wrapperStyles.ts b/src/dash-table/derived/cell/wrapperStyles.ts
@@ -34,7 +34,7 @@ const getter = (
             return;
         }
 
-        styles[i][j] = R.merge(styles[i][j], SELECTED_CELL_STYLE);
+        styles[i][j] = R.mergeRight(styles[i][j], SELECTED_CELL_STYLE);
     }, selectedCells);
 
     return styles;

diff --git a/src/dash-table/derived/table/index.tsx b/src/dash-table/derived/table/index.tsx
@@ -25,7 +25,7 @@ const handleSetFilter = (
 function propsAndMapFn(propsFn: () => ControlledTableProps, setFilter: any) {
     const props = propsFn();
 
-    return R.merge(props, { map: props.workFilter.map, setFilter });
+    return R.mergeRight(props, { map: props.workFilter.map, setFilter });
 }
 
 export default (propsFn: () => ControlledTableProps) => {

diff --git a/src/dash-table/syntax-tree/lexeme/relational.ts b/src/dash-table/syntax-tree/lexeme/relational.ts
@@ -63,7 +63,7 @@ const LEXEME_BASE = {
     type: LexemeType.RelationalOperator
 };
 
-export const contains: IUnboundedLexeme = R.merge({
+export const contains: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         !R.isNil(exp) &&
         !R.isNil(op) &&
@@ -76,7 +76,7 @@ export const contains: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const equal: IUnboundedLexeme = R.merge({
+export const equal: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op === +exp :
@@ -88,15 +88,15 @@ export const equal: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const greaterOrEqual: IUnboundedLexeme = R.merge({
+export const greaterOrEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) => op >= exp),
     subType: RelationalOperator.GreaterOrEqual,
     case: 'default',
     regexp: /^(>=|(ge)(?=\s|$))/i,
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const greaterThan: IUnboundedLexeme = R.merge({
+export const greaterThan: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) => op > exp),
     subType: RelationalOperator.GreaterThan,
     case: 'default',
@@ -108,7 +108,7 @@ const DATE_OPTIONS: IDateValidation = {
     allow_YY: true
 };
 
-export const dateStartsWith: IUnboundedLexeme = R.merge({
+export const dateStartsWith: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) => {
         op = typeof op === 'number' ? op.toString() : op;
         exp = typeof exp === 'number' ? exp.toString() : exp;
@@ -126,31 +126,31 @@ export const dateStartsWith: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const lessOrEqual: IUnboundedLexeme = R.merge({
+export const lessOrEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) => op <= exp),
     subType: RelationalOperator.LessOrEqual,
     case: 'default',
     regexp: /^(<=|(le)(?=\s|$))/i,
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const lessThan: IUnboundedLexeme = R.merge({
+export const lessThan: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) => op < exp),
     subType: RelationalOperator.LessThan,
     case: 'default',
     regexp: /^(<|(lt)(?=\s|$))/i,
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const notEqual: IUnboundedLexeme = R.merge({
+export const notEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) => op !== exp),
     subType: RelationalOperator.NotEqual,
     case: 'default',
     regexp: /^(!=|(ne)(?=\s|$))/i,
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const icontains: IUnboundedLexeme = R.merge({
+export const icontains: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         !R.isNil(exp) &&
         !R.isNil(op) &&
@@ -163,7 +163,7 @@ export const icontains: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const iequal: IUnboundedLexeme = R.merge({
+export const iequal: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op === +exp :
@@ -175,7 +175,7 @@ export const iequal: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const igreaterOrEqual: IUnboundedLexeme = R.merge({
+export const igreaterOrEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op >= +exp :
@@ -186,7 +186,7 @@ export const igreaterOrEqual: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const igreaterThan: IUnboundedLexeme = R.merge({
+export const igreaterThan: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op > +exp :
@@ -197,7 +197,7 @@ export const igreaterThan: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const ilessOrEqual: IUnboundedLexeme = R.merge({
+export const ilessOrEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op <= +exp :
@@ -208,7 +208,7 @@ export const ilessOrEqual: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const ilessThan: IUnboundedLexeme = R.merge({
+export const ilessThan: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op < +exp :
@@ -219,7 +219,7 @@ export const ilessThan: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const inotEqual: IUnboundedLexeme = R.merge({
+export const inotEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op !== +exp :
@@ -230,7 +230,7 @@ export const inotEqual: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const scontains: IUnboundedLexeme = R.merge({
+export const scontains: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         !R.isNil(exp) &&
         !R.isNil(op) &&
@@ -243,7 +243,7 @@ export const scontains: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const sequal: IUnboundedLexeme = R.merge({
+export const sequal: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op === +exp :
@@ -255,7 +255,7 @@ export const sequal: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const sgreaterOrEqual: IUnboundedLexeme = R.merge({
+export const sgreaterOrEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op >= +exp :
@@ -266,7 +266,7 @@ export const sgreaterOrEqual: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const sgreaterThan: IUnboundedLexeme = R.merge({
+export const sgreaterThan: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op > +exp :
@@ -277,7 +277,7 @@ export const sgreaterThan: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const slessOrEqual: IUnboundedLexeme = R.merge({
+export const slessOrEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op <= +exp :
@@ -288,7 +288,7 @@ export const slessOrEqual: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const slessThan: IUnboundedLexeme = R.merge({
+export const slessThan: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op < +exp :
@@ -299,7 +299,7 @@ export const slessThan: IUnboundedLexeme = R.merge({
     regexpMatch: 1
 }, LEXEME_BASE);
 
-export const snotEqual: IUnboundedLexeme = R.merge({
+export const snotEqual: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(([op, exp]) =>
         (isNumeric(op) && isNumeric(exp)) ?
             +op !== +exp :

diff --git a/src/dash-table/syntax-tree/lexeme/unary.ts b/src/dash-table/syntax-tree/lexeme/unary.ts
@@ -65,47 +65,47 @@ export const not: IUnboundedLexeme = {
     }
 };
 
-export const isBool: IUnboundedLexeme = R.merge({
+export const isBool: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => typeof opValue === 'boolean'),
     regexp: /^(is bool)/i
 }, LEXEME_BASE);
 
-export const isEven: IUnboundedLexeme = R.merge({
+export const isEven: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => typeof opValue === 'number' && opValue % 2 === 0),
     regexp: /^(is even)/i
 }, LEXEME_BASE);
 
-export const isBlank: IUnboundedLexeme = R.merge({
+export const isBlank: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => opValue === undefined || opValue === null || opValue === ''),
     regexp: /^(is blank)/i
 }, LEXEME_BASE);
 
-export const isNil: IUnboundedLexeme = R.merge({
+export const isNil: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => opValue === undefined || opValue === null),
     regexp: /^(is nil)/i
 }, LEXEME_BASE);
 
-export const isNum: IUnboundedLexeme = R.merge({
+export const isNum: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => typeof opValue === 'number'),
     regexp: /^(is num)/i
 }, LEXEME_BASE);
 
-export const isObject: IUnboundedLexeme = R.merge({
+export const isObject: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => opValue !== null && typeof opValue === 'object'),
     regexp: /^(is object)/i
 }, LEXEME_BASE);
 
-export const isOdd: IUnboundedLexeme = R.merge({
+export const isOdd: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => typeof opValue === 'number' && opValue % 2 === 1),
     regexp: /^(is odd)/i
 }, LEXEME_BASE);
 
-export const isPrime: IUnboundedLexeme = R.merge({
+export const isPrime: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => typeof opValue === 'number' && checkPrimality(opValue)),
     regexp: /^(is prime)/i
 }, LEXEME_BASE);
 
-export const isStr: IUnboundedLexeme = R.merge({
+export const isStr: IUnboundedLexeme = R.mergeRight({
     evaluate: relationalEvaluator(opValue => typeof opValue === 'string'),
     regexp: /^(is str)/i
 }, LEXEME_BASE);
diff --git a/tests/visual/percy-storybook/Style.percy.tsx b/tests/visual/percy-storybook/Style.percy.tsx
@@ -357,7 +357,7 @@ storiesOf('DashTable/Style type condition', module)
     .add('paging', () => (<DataTable
         id='styling-20'
         data= {mock.data}
-        columns={ mock.columns.map((col: any) => R.merge(col, {
+        columns={ mock.columns.map((col: any) => R.mergeRight(col, {
             name: col.name,
             deletable: true
         }))}

diff --git a/tests/visual/percy-storybook/Width.empty.percy.tsx b/tests/visual/percy-storybook/Width.empty.percy.tsx
@@ -39,22 +39,22 @@ storiesOf('DashTable/Empty', module)
         {...props}
     />))
     .add('with column filters -- invalid query', () => (<DataTable
-        {...R.merge(props, {
+        {...R.mergeRight(props, {
             filter_query: '{a} !'
         })}
     />))
     .add('with column filters -- single query', () => (<DataTable
-        {...R.merge(props, {
+        {...R.mergeRight(props, {
             filter_query: '{a} ge 0'
         })}
     />))
     .add('with column filters -- multi query', () => (<DataTable
-        {...R.merge(props, {
+        {...R.mergeRight(props, {
             filter_query: '{a} ge 0 && {b} ge 0'
         })}
     />))
     .add('with column filters -- multi query, no data', () => (<DataTable
-        {...R.merge(props, {
+        {...R.mergeRight(props, {
             filter_query: '{a} gt 1000 && {b} gt 1000'
         })}
     />));