Merge branch 'fileuploader-select-file-link' of github.com:asudoh/car…

…bon-components into fileuploader-select-file-link
carbon-design-system · Jan 13, 2020 · 87c3cf8 · 87c3cf8
2 parents a5f7106 + 0188c1e
commit 87c3cf8
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "prettier": "^1.19.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "rimraf": "^2.6.3",
+    "rimraf": "^3.0.0",
     "stylelint": "^10.0.1"
   },
   "husky": {

diff --git a/packages/colors/package.json b/packages/colors/package.json
@@ -39,7 +39,7 @@
     "core-js": "^3.0.1",
     "fs-extra": "^7.0.0",
     "node-sass": "^4.11.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^3.0.0"
   },
   "eyeglass": {
     "exports": false,

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -22197,6 +22197,7 @@ Text area styles
   .#{$prefix}--text-area__wrapper {
     position: relative;
     display: flex;
+    width: 100%;
   }
 
   .#{$prefix}--text-area__invalid-icon {

diff --git a/packages/components/src/components/list/_list.scss b/packages/components/src/components/list/_list.scss
@@ -23,7 +23,7 @@
   .#{$prefix}--list--ordered {
     @include reset;
     @include type-style('body-short-01');
-    
+
     list-style: none;
   }
 

diff --git a/packages/components/src/components/text-area/_text-area.scss b/packages/components/src/components/text-area/_text-area.scss
@@ -77,6 +77,7 @@
   .#{$prefix}--text-area__wrapper {
     position: relative;
     display: flex;
+    width: 100%;
   }
 
   .#{$prefix}--text-area__invalid-icon {

diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -45,6 +45,6 @@
     "fs-extra": "^7.0.1",
     "klaw-sync": "^6.0.0",
     "replace-in-file": "^3.4.2",
-    "rimraf": "^2.6.2"
+    "rimraf": "^3.0.0"
   }
 }
diff --git a/packages/grid/package.json b/packages/grid/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@carbon/bundler": "^10.5.0",
-    "rimraf": "^2.6.3"
+    "rimraf": "^3.0.0"
   },
   "eyeglass": {
     "exports": false,

diff --git a/packages/icon-build-helpers/package.json b/packages/icon-build-helpers/package.json
@@ -34,7 +34,7 @@
     "prop-types": "^15.6.2",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
-    "rimraf": "^2.6.2",
+    "rimraf": "^3.0.0",
     "rollup": "^1.15.1",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-replace": "^2.2.0",

diff --git a/packages/icon-helpers/package.json b/packages/icon-helpers/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@carbon/bundler": "^10.5.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^3.0.0"
   },
   "sideEffects": false
 }
diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json
@@ -31,7 +31,7 @@
     "@carbon/icons": "^10.8.0",
     "fs-extra": "^7.0.1",
     "prettier": "^1.19.1",
-    "rimraf": "^2.6.2",
+    "rimraf": "^3.0.0",
     "rollup": "^1.15.1",
     "vue": "^2.6.8"
   },

diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -30,7 +30,7 @@
     "@carbon/scss-generator": "^10.5.0",
     "@carbon/test-utils": "^10.6.0",
     "core-js": "^3.4.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^3.0.0"
   },
   "eyeglass": {
     "exports": false,

diff --git a/packages/motion/package.json b/packages/motion/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@carbon/bundler": "^10.5.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^3.0.0"
   },
   "eyeglass": {
     "exports": false,

diff --git a/packages/pictograms-react/examples/storybook/package.json b/packages/pictograms-react/examples/storybook/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "carbon-icons-react-storybook",
+  "name": "carbon-pictograms-react-storybook",
   "license": "Apache-2.0",
   "scripts": {
     "storybook": "start-storybook -p 6006",

diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js
@@ -282,11 +282,7 @@ export default class Dropdown extends React.Component {
                     id={fieldLabelId}
                     className={`${prefix}--list-box__label`}
                     {...getLabelProps()}>
-                    {selectedItem
-                      ? itemToElement
-                        ? itemToElement(selectedItem)
-                        : itemToString(selectedItem)
-                      : label}
+                    {selectedItem ? itemToString(selectedItem) : label}
                   </span>
                   <ListBox.MenuIcon
                     isOpen={isOpen}

diff --git a/packages/react/src/components/TileGroup/TileGroup-test.js b/packages/react/src/components/TileGroup/TileGroup-test.js
@@ -14,8 +14,8 @@ describe('TileGroup', () => {
   describe('renders as expected', () => {
     const wrapper = mount(
       <TileGroup defaultSelected="female" name="gender">
-        <RadioTile labelText="Male" value="male" />
-        <RadioTile labelText="Female" value="female" />
+        <RadioTile value="male" />
+        <RadioTile value="female" />
       </TileGroup>
     );
 

diff --git a/packages/react/src/components/UIShell/HeaderMenu.js b/packages/react/src/components/UIShell/HeaderMenu.js
@@ -105,9 +105,18 @@ class HeaderMenu extends React.Component {
   handleOnBlur = event => {
     // Rough guess for a blur event that is triggered outside of our menu or
     // menubar context
-    if (!event.relatedTarget) {
-      this.setState({ expanded: false, selectedIndex: null });
+    const itemTriggeredBlur = this.items.find(
+      element => element === event.relatedTarget
+    );
+
+    if (
+      event.relatedTarget &&
+      (event.relatedTarget.getAttribute('href') !== '#' || itemTriggeredBlur)
+    ) {
+      return;
     }
+
+    this.setState({ expanded: false, selectedIndex: null });
   };
 
   /**

diff --git a/packages/sketch/package.json b/packages/sketch/package.json
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "cross-env": "^5.2.0",
-    "rimraf": "^2.6.3"
+    "rimraf": "^3.0.0"
   },
   "skpm": {
     "name": "Carbon Elements",

diff --git a/packages/themes/package.json b/packages/themes/package.json
@@ -37,6 +37,6 @@
     "fs-extra": "^7.0.1",
     "js-yaml": "^3.13.0",
     "node-sass": "^4.11.0",
-    "rimraf": "^2.6.3"
+    "rimraf": "^3.0.0"
   }
 }
diff --git a/packages/type/package.json b/packages/type/package.json
@@ -39,7 +39,7 @@
     "@carbon/bundler": "^10.5.0",
     "@carbon/test-utils": "^10.6.0",
     "change-case": "^3.1.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^3.0.0"
   },
   "eyeglass": {
     "exports": false,