Merge branch 'main' into color-tokens-1

carbon-design-system · Apr 26, 2021 · e9d9182 · e9d9182
2 parents c3fedfa + 19cd709
commit e9d9182
Show file tree

Hide file tree

Showing 34 changed files with 125 additions and 156 deletions.
diff --git a/...ata-npm-7.13.12-5237329d0e-a246d004a1.zip → ...ata-npm-7.13.15-918c0afecc-f43046d95a.zip b/...ata-npm-7.13.12-5237329d0e-a246d004a1.zip → ...ata-npm-7.13.15-918c0afecc-f43046d95a.zip
diff --git a/...ore-npm-7.13.14-f50bfae47b-3c08166ab8.zip → ...ore-npm-7.13.16-42012903a1-bb311e7acb.zip b/...ore-npm-7.13.14-f50bfae47b-3c08166ab8.zip → ...ore-npm-7.13.16-42012903a1-bb311e7acb.zip
diff --git a/...ator-npm-7.13.9-fd99b9df46-1b0e9fa1b5.zip → ...tor-npm-7.13.16-dcf931b10c-6aa65912b9.zip b/...ator-npm-7.13.9-fd99b9df46-1b0e9fa1b5.zip → ...tor-npm-7.13.16-dcf931b10c-6aa65912b9.zip
diff --git a/.yarn/cache/@babel-helper-compilation-targets-npm-7.13.13-920e7fb719-5448567b11.zip b/.yarn/cache/@babel-helper-compilation-targets-npm-7.13.13-920e7fb719-5448567b11.zip
diff --git a/.yarn/cache/@babel-helper-compilation-targets-npm-7.13.16-e8eed91d8d-08c8fcd998.zip b/.yarn/cache/@babel-helper-compilation-targets-npm-7.13.16-e8eed91d8d-08c8fcd998.zip
diff --git a/.yarn/cache/@babel-helpers-npm-7.13.10-1c8303d269-3f55d6b7b0.zip b/.yarn/cache/@babel-helpers-npm-7.13.10-1c8303d269-3f55d6b7b0.zip
diff --git a/.yarn/cache/@babel-helpers-npm-7.13.17-83bce7ca54-825fee4734.zip b/.yarn/cache/@babel-helpers-npm-7.13.17-83bce7ca54-825fee4734.zip
diff --git a/.yarn/cache/@babel-parser-npm-7.13.13-3ee901abcf-30deada9f9.zip b/.yarn/cache/@babel-parser-npm-7.13.13-3ee901abcf-30deada9f9.zip
diff --git a/.yarn/cache/@babel-parser-npm-7.13.16-a424e995a5-5dd35906ab.zip b/.yarn/cache/@babel-parser-npm-7.13.16-a424e995a5-5dd35906ab.zip
diff --git a/.yarn/cache/@babel-plugin-syntax-flow-npm-7.12.13-5d65bcc790-0edfd8d0a3.zip b/.yarn/cache/@babel-plugin-syntax-flow-npm-7.12.13-5d65bcc790-0edfd8d0a3.zip
diff --git a/.yarn/cache/@babel-plugin-syntax-flow-npm-7.8.3-dc6d41e03b-13e8e9a0af.zip b/.yarn/cache/@babel-plugin-syntax-flow-npm-7.8.3-dc6d41e03b-13e8e9a0af.zip
diff --git a/.yarn/cache/@babel-plugin-syntax-typescript-npm-7.12.13-17e8d888d4-3bd08315a8.zip b/.yarn/cache/@babel-plugin-syntax-typescript-npm-7.12.13-17e8d888d4-3bd08315a8.zip
diff --git a/.yarn/cache/@babel-plugin-syntax-typescript-npm-7.8.3-375b335000-a04400542a.zip b/.yarn/cache/@babel-plugin-syntax-typescript-npm-7.8.3-375b335000-a04400542a.zip
diff --git a/.yarn/cache/@babel-plugin-transform-flow-strip-types-npm-7.13.0-afc37842f7-f15fe806d3.zip b/.yarn/cache/@babel-plugin-transform-flow-strip-types-npm-7.13.0-afc37842f7-f15fe806d3.zip
diff --git a/.yarn/cache/@babel-plugin-transform-flow-strip-types-npm-7.8.3-ca347504e2-aff652ea56.zip b/.yarn/cache/@babel-plugin-transform-flow-strip-types-npm-7.8.3-ca347504e2-aff652ea56.zip
diff --git a/.yarn/cache/@babel-plugin-transform-typescript-npm-7.13.0-8b22979b87-ddc3089ba5.zip b/.yarn/cache/@babel-plugin-transform-typescript-npm-7.13.0-8b22979b87-ddc3089ba5.zip
diff --git a/.yarn/cache/@babel-plugin-transform-typescript-npm-7.8.3-a358104154-a920469362.zip b/.yarn/cache/@babel-plugin-transform-typescript-npm-7.8.3-a358104154-a920469362.zip
diff --git a/.yarn/cache/@babel-preset-flow-npm-7.13.13-fc645e82ee-c90b30333d.zip b/.yarn/cache/@babel-preset-flow-npm-7.13.13-fc645e82ee-c90b30333d.zip
diff --git a/.yarn/cache/@babel-preset-flow-npm-7.8.3-5711c85860-b74a0bac1f.zip b/.yarn/cache/@babel-preset-flow-npm-7.8.3-5711c85860-b74a0bac1f.zip
diff --git a/.yarn/cache/@babel-preset-typescript-npm-7.13.0-3015981691-03635c7b0e.zip b/.yarn/cache/@babel-preset-typescript-npm-7.13.0-3015981691-03635c7b0e.zip
diff --git a/.yarn/cache/@babel-preset-typescript-npm-7.8.3-3d2879f0ba-c47eb1e11a.zip b/.yarn/cache/@babel-preset-typescript-npm-7.8.3-3d2879f0ba-c47eb1e11a.zip
diff --git a/.yarn/cache/@babel-register-npm-7.13.16-c9089f2afd-a2a4622292.zip b/.yarn/cache/@babel-register-npm-7.13.16-c9089f2afd-a2a4622292.zip
diff --git a/.yarn/cache/@babel-register-npm-7.8.3-c1b1f5f562-393d514cb4.zip b/.yarn/cache/@babel-register-npm-7.8.3-c1b1f5f562-393d514cb4.zip
diff --git a/...rse-npm-7.13.13-877b553b60-97b8598572.zip → ...rse-npm-7.13.17-924a2859e1-beed02a48b.zip b/...rse-npm-7.13.13-877b553b60-97b8598572.zip → ...rse-npm-7.13.17-924a2859e1-beed02a48b.zip
diff --git a/...pes-npm-7.13.14-2ecc61348b-ba3d041557.zip → ...pes-npm-7.13.17-0f101c5a5a-985ea4639a.zip b/...pes-npm-7.13.14-2ecc61348b-ba3d041557.zip → ...pes-npm-7.13.17-0f101c5a5a-985ea4639a.zip
diff --git a/.yarn/cache/jscodeshift-npm-0.11.0-1f09880900-647dc36a50.zip b/.yarn/cache/jscodeshift-npm-0.11.0-1f09880900-647dc36a50.zip
diff --git a/.yarn/cache/jscodeshift-npm-0.12.0-e02ce05682-6512de487a.zip b/.yarn/cache/jscodeshift-npm-0.12.0-e02ce05682-6512de487a.zip
diff --git a/.yarn/cache/jscodeshift-npm-0.6.4-e129df6a92-d50a93db7a.zip b/.yarn/cache/jscodeshift-npm-0.6.4-e129df6a92-d50a93db7a.zip
diff --git a/.yarn/cache/recast-npm-0.16.2-4deca757cb-855c51c1b4.zip b/.yarn/cache/recast-npm-0.16.2-4deca757cb-855c51c1b4.zip
diff --git a/codemods/package.json b/codemods/package.json
@@ -19,6 +19,6 @@
   ],
   "dependencies": {
     "@babel/preset-env": "^7.12.13",
-    "jscodeshift": "^0.11.0"
+    "jscodeshift": "^0.12.0"
   }
 }
diff --git a/packages/react/src/components/NumberInput/NumberInput-test.js b/packages/react/src/components/NumberInput/NumberInput-test.js
@@ -411,9 +411,10 @@ describe('NumberInput', () => {
       });
 
       it('should invoke onClick when up arrow is clicked', () => {
+        wrapper.setProps({ value: 1 });
         upArrow.simulate('click');
         expect(onClick).toBeCalled();
-        expect(onClick).toHaveBeenCalledWith(expect.anything(), 'up');
+        expect(onClick).toHaveBeenCalledWith(expect.anything(), 'up', 2);
       });
 
       it('should only increase the value on up arrow click if value is less than max', () => {
@@ -466,13 +467,16 @@ describe('NumberInput', () => {
         downArrow.simulate('click');
         expect(onClick).toBeCalled();
         expect(onChange).toBeCalled();
-        expect(onClick).toHaveBeenCalledWith(expect.anything(), 'down');
+        expect(onClick).toHaveBeenCalledWith(expect.anything(), 'down', 0);
       });
 
       it('should invoke onChange when numberInput is changed', () => {
         input.simulate('change');
         expect(onChange).toBeCalled();
-        expect(onChange).toHaveBeenCalledWith(expect.anything());
+        expect(onChange).toHaveBeenCalledWith(
+          expect.anything(),
+          expect.anything()
+        );
       });
     });
   });

diff --git a/packages/react/src/components/NumberInput/NumberInput.js b/packages/react/src/components/NumberInput/NumberInput.js
@@ -249,16 +249,18 @@ class NumberInput extends Component {
     if (!disabled) {
       evt.persist();
       evt.imaginaryTarget = this._inputRef;
+      const prevValue = this.state.value;
       const value = evt.target.value;
+      const direction = prevValue < value ? 'up' : 'down';
       this.setState(
         {
           value,
         },
         () => {
           if (useControlledStateWithValue) {
-            onChange(evt, { value });
+            onChange(evt, { value, direction });
           } else if (onChange) {
-            onChange(evt);
+            onChange(evt, { value, direction });
           }
         }
       );
@@ -286,12 +288,14 @@ class NumberInput extends Component {
           value,
         },
         () => {
+          //TO-DO v11: update these events to return the same things --> evt, {value, direction}
           if (useControlledStateWithValue) {
             onClick && onClick(evt, { value, direction });
             onChange && onChange(evt, { value, direction });
           } else {
-            onClick && onClick(evt, direction);
-            onChange && onChange(evt, direction);
+            // value added as a 3rd argument rather than in same obj so it doesn't break in v10
+            onClick && onClick(evt, direction, value);
+            onChange && onChange(evt, direction, value);
           }
         }
       );

diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
@@ -37,7 +37,7 @@
     "fs-extra": "^8.1.0",
     "inquirer": "^6.3.1",
     "jest-diff": "^23.6.0",
-    "jscodeshift": "^0.6.4",
+    "jscodeshift": "^0.12.0",
     "lodash.clonedeep": "^4.5.0",
     "npm-which": "^3.0.1",
     "semver": "^7.3.4",