Merge pull request #204 from data-driven-forms/next-remove-icons

rvsia · web-flow · commit 1ed71f643dba · 2019-11-06T10:46:46.000+01:00
Removed PF4 react-icons from code base.
diff --git a/packages/pf4-component-mapper/package.json b/packages/pf4-component-mapper/package.json
@@ -23,7 +23,6 @@
     "@babel/preset-react": "^7.0.0",
     "@data-driven-forms/react-form-renderer": "*",
     "@patternfly/react-core": "^3.104.0",
-    "@patternfly/react-icons": "^3.14.2",
     "@semantic-release/git": "^7.0.5",
     "@semantic-release/npm": "^5.1.1",
     "babel-core": "^7.0.0-bridge.0",
@@ -85,8 +84,7 @@
   },
   "peerDependencies": {
     "@data-driven-forms/react-form-renderer": "^1.11.0",
-    "@patternfly/react-core": "^3.104.0",
-    "@patternfly/react-icons": "^3.14.2"
+    "@patternfly/react-core": "^3.104.0"
   },
   "dependencies": {
     "@patternfly/patternfly-next": "^1.0.175",
diff --git a/packages/pf4-component-mapper/rollup.config.js b/packages/pf4-component-mapper/rollup.config.js
@@ -12,7 +12,6 @@ const globals = {
   react: 'React',
   'react-dom': 'ReactDOM',
   '@patternfly/react-core': 'PatternflyReact',
-  '@patternfly/react-icons': 'PatternflyReactIcons',
   '@data-driven-forms/react-form-renderer': '@data-driven-forms/react-form-renderer',
 };
 
diff --git a/packages/pf4-component-mapper/size-snapshot.json b/packages/pf4-component-mapper/size-snapshot.json
@@ -1,7 +1,7 @@
 {
   "dist/index.js": {
-    "bundled": 346567,
-    "minified": 141696,
-    "gzipped": 39777
+    "bundled": 354331,
+    "minified": 147276,
+    "gzipped": 42033
   }
 }
diff --git a/packages/pf4-component-mapper/src/form-fields/fieldArray/index.js b/packages/pf4-component-mapper/src/form-fields/fieldArray/index.js
@@ -1,7 +1,9 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Grid, GridItem, Bullseye, FormHelperText } from '@patternfly/react-core';
-import { CloseIcon, AddCircleOIcon } from '@patternfly/react-icons';
+
+import CloseIcon from '../../icons/close-icon';
+import AddCircleOIcon from '../../icons/add-circle-o-icon';
 
 import './final-form-array.scss';
 
diff --git a/packages/pf4-component-mapper/src/form-fields/select/clear-indicator.js b/packages/pf4-component-mapper/src/form-fields/select/clear-indicator.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { TimesCircleIcon } from '@patternfly/react-icons';
 import { Button, ButtonVariant } from '@patternfly/react-core';
 
+import TimesCircleIcon from '../../icons/times-circle-icon';
+
 const ClearIndicator = ({
   clearValue,
   innerProps: { ref, ...restInnerProps },
diff --git a/packages/pf4-component-mapper/src/form-fields/select/dropdown-indicator.js b/packages/pf4-component-mapper/src/form-fields/select/dropdown-indicator.js
@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CaretDownIcon, CircleNotchIcon } from '@patternfly/react-icons';
+
+import CaretDownIcon from '../../icons/caret-down-icon';
+import CircleNotchIcon from '../../icons/circle-notch-icon';
 
 const DropdownIndicator = ({ selectProps: { isFetching }}) => isFetching ? <CircleNotchIcon className="spinning" /> : <CaretDownIcon />;
 
diff --git a/packages/pf4-component-mapper/src/form-fields/select/multi-value-remove.js b/packages/pf4-component-mapper/src/form-fields/select/multi-value-remove.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { components } from 'react-select';
-import { TimesCircleIcon } from '@patternfly/react-icons';
+
+import TimesCircleIcon from '../../icons/times-circle-icon';
 
 const MultiValueRemove = props => (
   <components.MultiValueRemove { ...props }>
diff --git a/packages/pf4-component-mapper/src/form-fields/select/option.js b/packages/pf4-component-mapper/src/form-fields/select/option.js
@@ -1,9 +1,10 @@
 import React from 'react';
 import { components } from 'react-select';
 import PropTypes from 'prop-types';
-import { CheckIcon } from '@patternfly/react-icons';
 import { Checkbox } from '@patternfly/react-core';
 
+import CheckIcon from '../../icons/check-icon';
+
 const Option = (props) => (
   <div
     className={ `ddorg__pf4-component-mapper__select__menu--option ${props.isFocused ? 'focused' : ''}` }
diff --git a/packages/pf4-component-mapper/src/icons/add-circle-o-icon.js b/packages/pf4-component-mapper/src/icons/add-circle-o-icon.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const AddCircleOIcon = props => (
+  <svg
+    fill="currentColor"
+    height="1em"
+    width="1em"
+    viewBox="0 64 1024 1024"
+    aria-labelledby="icon-title-25"
+    role="img"
+    style={{ 'vertical-align': '-0.375em;' }}
+    tabIndex="0"
+    { ...props }
+  >
+    <title id="icon-title-25">AddCircleOIcon</title>
+    <path d="M512.059-73.143c-282.338 0-512.059 229.673-512.059 512.025 0 282.238 229.721 511.975 512.059 511.975 282.283 0 511.941-229.735 511.941-511.975 0.005-282.352-229.659-512.025-511.941-512.025zM512.059 826.523c-213.826 0-387.728-173.856-387.728-387.643 0-213.888 173.904-387.691 387.728-387.691 213.717 0 387.671 173.803 387.671 387.691 0.005 213.785-173.957 387.643-387.671 387.643zM726.283 506.777c-3.429 3.477-7.803 5.223-13.138 5.223h-128.005v128.007c0 5.333-1.739 9.71-5.218 13.138s-7.936 5.141-13.351 5.141h-109.143c-5.417 0-9.863-1.714-13.351-5.141-3.481-3.429-5.221-7.808-5.221-13.141v-128.005l-128.007-0.002c-5.333 0-9.71-1.737-13.138-5.218-3.426-3.477-5.141-7.934-5.141-13.351v-109.143c0-5.417 1.714-9.856 5.141-13.351 3.429-3.481 7.808-5.221 13.141-5.221l128.005 0.002v-128.009c0-5.335 1.744-9.707 5.225-13.134 3.477-3.429 7.927-5.145 13.344-5.145h109.143c5.417 0 9.858 1.717 13.351 5.145 3.477 3.429 5.223 7.803 5.223 13.138v128.002h128.007c5.335 0 9.707 1.742 13.134 5.225 3.429 3.477 5.145 7.927 5.145 13.344v109.143c0 5.417-1.717 9.863-5.145 13.351z" transform="rotate(180 0 512) scale(-1 1)"></path>
+  </svg>
+);
+
+export default AddCircleOIcon;
diff --git a/packages/pf4-component-mapper/src/icons/caret-down-icon.js b/packages/pf4-component-mapper/src/icons/caret-down-icon.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const CaretDownIcon = props => (
+  <svg
+    fill="currentColor"
+    height="1em"
+    width="1em"
+    viewBox="0 0 320 512"
+    aria-labelledby="icon-title-219"
+    role="img"
+    style={{ 'vertical-align': '-0.375em;' }}
+    tabIndex="0"
+    { ...props }
+  >
+    <title id="icon-title-219">CaretDownIcon</title>
+    <path d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z" transform=""></path>
+  </svg>
+);
+
+export default CaretDownIcon;
diff --git a/packages/pf4-component-mapper/src/icons/check-icon.js b/packages/pf4-component-mapper/src/icons/check-icon.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const CheckIcon = props => (
+  <svg
+    fill="currentColor"
+    height="1em"
+    width="1em"
+    viewBox="0 0 512 512"
+    aria-labelledby="icon-title-260"
+    role="img"
+    style={{ 'vertical-align': '-0.375em;' }}
+    tabIndex="0"
+    { ...props }
+  >
+    <title id="icon-title-260">CheckIcon</title>
+    <path d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z" transform=""></path>
+  </svg>
+);
+
+export default CheckIcon;
diff --git a/packages/pf4-component-mapper/src/icons/circle-notch-icon.js b/packages/pf4-component-mapper/src/icons/circle-notch-icon.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const CircleNotchIcon = props => (
+  <svg
+    fill="currentColor"
+    height="1em"
+    width="1em"
+    viewBox="0 0 512 512"
+    aria-labelledby="icon-title-284"
+    role="img"
+    style={{ 'vertical-align': '-0.375em;' }}
+    tabIndex="0"
+    { ...props }
+  >
+    <title id="icon-title-284">CircleNotchIcon</title>
+    <path d="M288 39.056v16.659c0 10.804 7.281 20.159 17.686 23.066C383.204 100.434 440 171.518 440 256c0 101.689-82.295 184-184 184-101.689 0-184-82.295-184-184 0-84.47 56.786-155.564 134.312-177.219C216.719 75.874 224 66.517 224 55.712V39.064c0-15.709-14.834-27.153-30.046-23.234C86.603 43.482 7.394 141.206 8.003 257.332c.72 137.052 111.477 246.956 248.531 246.667C393.255 503.711 504 392.788 504 256c0-115.633-79.14-212.779-186.211-240.236C302.678 11.889 288 23.456 288 39.056z" transform=""></path>
+  </svg>
+);
+
+export default CircleNotchIcon;
diff --git a/packages/pf4-component-mapper/src/icons/close-icon.js b/packages/pf4-component-mapper/src/icons/close-icon.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const CloseIcon = props => (
+  <svg
+    fill="currentColor"
+    height="1em"
+    width="1em"
+    viewBox="0 64 731 1024"
+    aria-labelledby="icon-title-293"
+    role="img"
+    style={{ 'vertical-align': '-0.375em;' }}
+    tabIndex="0"
+    { ...props }
+  >
+    <title id="icon-title-293">CloseIcon</title>
+    <path d="M96.464 804.571c-4.816-0.064-9.12-1.963-12.912-5.733l-77.815-77.815c-3.769-3.794-5.669-8.096-5.735-12.91-0.032-4.839 1.815-9.113 5.543-12.823l616.603-616.606c3.71-3.714 7.986-5.577 12.823-5.541 4.834 0.039 9.138 1.957 12.91 5.73l77.817 77.819c3.769 3.769 5.691 8.066 5.73 12.912 0.037 4.839-1.829 9.106-5.538 12.825l-616.606 616.599c-3.717 3.73-7.986 5.575-12.821 5.541zM622.144 799.031l-616.603-616.601c-3.726-3.717-5.577-7.989-5.536-12.827 0.059-4.843 1.959-9.143 5.728-12.914l77.817-77.817c3.792-3.774 8.096-5.691 12.91-5.728 4.837-0.039 9.106 1.824 12.821 5.536l616.599 616.608c3.717 3.712 5.579 7.989 5.543 12.823-0.041 4.814-1.959 9.118-5.728 12.91l-77.824 77.808c-3.767 3.778-8.073 5.678-12.907 5.744-4.834 0.034-9.104-1.815-12.818-5.541z" transform="rotate(180 0 512) scale(-1 1)"></path>
+  </svg>
+);
+
+export default CloseIcon;
diff --git a/packages/pf4-component-mapper/src/icons/times-circle-icon.js b/packages/pf4-component-mapper/src/icons/times-circle-icon.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const TimesCircleIcon = props => (
+  <svg
+    fill="currentColor"
+    height="1em"
+    width="1em"
+    viewBox="0 0 512 512"
+    aria-labelledby="icon-title-1495"
+    role="img"
+    style={{ 'vertical-align': '-0.375em;' }}
+    tabIndex="0"
+    { ...props }
+  >
+    <title id="icon-title-1495">TimesCircleIcon</title>
+    <path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm121.6 313.1c4.7 4.7 4.7 12.3 0 17L338 377.6c-4.7 4.7-12.3 4.7-17 0L256 312l-65.1 65.6c-4.7 4.7-12.3 4.7-17 0L134.4 338c-4.7-4.7-4.7-12.3 0-17l65.6-65-65.6-65.1c-4.7-4.7-4.7-12.3 0-17l39.6-39.6c4.7-4.7 12.3-4.7 17 0l65 65.7 65.1-65.6c4.7-4.7 12.3-4.7 17 0l39.6 39.6c4.7 4.7 4.7 12.3 0 17L312 256l65.6 65.1z" transform=""></path>
+  </svg>
+);
+
+export default TimesCircleIcon;
diff --git a/packages/pf4-component-mapper/src/tests/field-array/__snapshots__/field-array.test.js.snap b/packages/pf4-component-mapper/src/tests/field-array/__snapshots__/field-array.test.js.snap
@@ -36,10 +36,10 @@ exports[`FieldArray should render array field correctly 1`] = `
         "sub-form": [Function],
         "switch-field": [Function],
         "tabs": [Function],
-        "tag-control": [Function],
         "text-field": [Function],
         "textarea-field": [Function],
         "time-picker": [Function],
+        "undefined": [Function],
         "wizard": [Function],
       }
     }
@@ -551,28 +551,29 @@ exports[`FieldArray should render array field correctly 1`] = `
                                       >
                                         <AddCircleOIcon
                                           className="ddf-final-form-group-add-icon"
-                                          color="currentColor"
-                                          noVerticalAlign={false}
                                           onClick={[Function]}
-                                          size="sm"
-                                          title={null}
                                         >
                                           <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
+                                            aria-labelledby="icon-title-25"
                                             className="ddf-final-form-group-add-icon"
                                             fill="currentColor"
-                                            height="1em"
+                                            height="3em"
                                             onClick={[Function]}
                                             role="img"
                                             style={
                                               Object {
-                                                "verticalAlign": "-0.125em",
+                                                "vertical-align": "-0.375em;",
                                               }
                                             }
+                                            tabIndex="0"
                                             viewBox="0 64 1024 1024"
-                                            width="1em"
+                                            width="3em"
                                           >
+                                            <title
+                                              id="icon-title-25"
+                                            >
+                                              AddCircleOIcon
+                                            </title>
                                             <path
                                               d="M512.059-73.143c-282.338 0-512.059 229.673-512.059 512.025 0 282.238 229.721 511.975 512.059 511.975 282.283 0 511.941-229.735 511.941-511.975 0.005-282.352-229.659-512.025-511.941-512.025zM512.059 826.523c-213.826 0-387.728-173.856-387.728-387.643 0-213.888 173.904-387.691 387.728-387.691 213.717 0 387.671 173.803 387.671 387.691 0.005 213.785-173.957 387.643-387.671 387.643zM726.283 506.777c-3.429 3.477-7.803 5.223-13.138 5.223h-128.005v128.007c0 5.333-1.739 9.71-5.218 13.138s-7.936 5.141-13.351 5.141h-109.143c-5.417 0-9.863-1.714-13.351-5.141-3.481-3.429-5.221-7.808-5.221-13.141v-128.005l-128.007-0.002c-5.333 0-9.71-1.737-13.138-5.218-3.426-3.477-5.141-7.934-5.141-13.351v-109.143c0-5.417 1.714-9.856 5.141-13.351 3.429-3.481 7.808-5.221 13.141-5.221l128.005 0.002v-128.009c0-5.335 1.744-9.707 5.225-13.134 3.477-3.429 7.927-5.145 13.344-5.145h109.143c5.417 0 9.858 1.717 13.351 5.145 3.477 3.429 5.223 7.803 5.223 13.138v128.002h128.007c5.335 0 9.707 1.742 13.134 5.225 3.429 3.477 5.145 7.927 5.145 13.344v109.143c0 5.417-1.717 9.863-5.145 13.351z"
                                               transform="rotate(180 0 512) scale(-1 1)"
diff --git a/packages/pf4-component-mapper/src/tests/field-array/field-array.test.js b/packages/pf4-component-mapper/src/tests/field-array/field-array.test.js
@@ -3,8 +3,9 @@ import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import FormRenderer, { componentTypes as components } from '@data-driven-forms/react-form-renderer';
 import { TextInput } from '@patternfly/react-core';
-import { CloseIcon, AddCircleOIcon } from '@patternfly/react-icons';
 
+import AddCircleOIcon from '../../icons/add-circle-o-icon';
+import CloseIcon from '../../icons/close-icon';
 import { formFieldsMapper, layoutMapper } from '../../index';
 
 describe('FieldArray', () => {
diff --git a/packages/react-renderer-demo/package.json b/packages/react-renderer-demo/package.json
@@ -6,55 +6,55 @@
         "node": "10"
     },
     "scripts": {
-    "dev": "next \"src/app/\"",
-    "preserve": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps && npm run install-deps",
-    "serve": "cross-env NODE_ENV=production firebase serve",
-    "predeploy": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps",
-    "deploy": "NODE_ENV=production firebase deploy",
-    "clean": "rimraf \"dist/functions/**\" && rimraf \"dist/public\"",
-    "build-public": "cpx \"src/public/**/*.*\" \"dist/public\" -C",
-    "build-funcs": "babel \"src/functions\" --out-dir \"dist/functions\"",
-    "build-app": "next build \"src/app/\"",
-    "copy-deps": "cpx \"*{package.json,package-lock.json,yarn.lock}\" \"dist/functions\" -C",
-    "install-deps": "cd \"dist/functions\" && npm i"
+        "dev": "next \"src/app/\"",
+        "preserve": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps && npm run install-deps",
+        "serve": "cross-env NODE_ENV=production firebase serve",
+        "predeploy": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps",
+        "deploy": "NODE_ENV=production firebase deploy",
+        "clean": "rimraf \"dist/functions/**\" && rimraf \"dist/public\"",
+        "build-public": "cpx \"src/public/**/*.*\" \"dist/public\" -C",
+        "build-funcs": "babel \"src/functions\" --out-dir \"dist/functions\"",
+        "build-app": "next build \"src/app/\"",
+        "copy-deps": "cpx \"*{package.json,package-lock.json,yarn.lock}\" \"dist/functions\" -C",
+        "install-deps": "cd \"dist/functions\" && npm i"
     },
     "dependencies": {
-    "firebase-admin": "^8.5.0",
-    "firebase-functions": "^2.1.0",
-    "grpc": "^1.22.2",
-    "next": "^9.0.5",
-    "react": "^16.10.2",
-    "react-dom": "^16.10.2",
-    "@babel/plugin-proposal-class-properties": "^7.2.3",
-    "@data-driven-forms/mui-component-mapper": "*",
-    "@data-driven-forms/pf3-component-mapper": "*",
-    "@data-driven-forms/pf4-component-mapper": "*",
-    "@data-driven-forms/react-form-renderer": "*",
-    "@material-ui/core": "^4.5.2",
-    "@material-ui/icons": "^4.5.1",
-    "@material-ui/styles": "^4.5.2",
-    "@mdx-js/loader": "^1.4.5",
-    "@mdx-js/react": "^1.4.5",
-    "@next/mdx": "^9.0.5",
-    "@patternfly/patternfly-next": "^1.0.175",
-    "@patternfly/react-core": "~3.16.10",
-    "@patternfly/react-icons": "~3.9.2",
-    "@patternfly/react-tokens": "^2.5.1",
-    "brace": "^0.11.1",
-    "clsx": "^1.0.4",
-    "patternfly-react": "^2.25.1",
-    "prop-types": "^15.6.2",
-    "raw-loader": "^3.1.0",
-    "react-ace": "^6.3.2",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-router-dom": "^5.0.1"
+        "@babel/plugin-proposal-class-properties": "^7.2.3",
+        "@data-driven-forms/mui-component-mapper": "*",
+        "@data-driven-forms/pf3-component-mapper": "*",
+        "@data-driven-forms/pf4-component-mapper": "*",
+        "@data-driven-forms/react-form-renderer": "*",
+        "@material-ui/core": "^4.5.2",
+        "@material-ui/icons": "^4.5.1",
+        "@material-ui/styles": "^4.5.2",
+        "@mdx-js/loader": "^1.4.5",
+        "@mdx-js/react": "^1.4.5",
+        "@next/mdx": "^9.0.5",
+        "@patternfly/patternfly-next": "^1.0.175",
+        "@patternfly/react-core": "~3.16.10",
+        "@patternfly/react-tokens": "^2.5.1",
+        "brace": "^0.11.1",
+        "clsx": "^1.0.4",
+        "firebase-admin": "^8.5.0",
+        "firebase-functions": "^2.1.0",
+        "grpc": "^1.22.2",
+        "next": "^9.0.5",
+        "patternfly-react": "^2.25.1",
+        "prop-types": "^15.6.2",
+        "raw-loader": "^3.1.0",
+        "react": "^16.10.2",
+        "react-ace": "^6.3.2",
+        "react-copy-to-clipboard": "^5.0.1",
+        "react-dom": "^16.10.2",
+        "react-router-dom": "^5.0.1"
     },
     "devDependencies": {
-    "@babel/cli": "^7.2.0",
-    "cpx": "^1.5.0",
-    "cross-env": "^5.2.0",
-    "firebase-functions-test": "^0.1.6",
-    "firebase-tools": "^6.1.0",
-    "rimraf": "^2.6.0"
+        "@babel/cli": "^7.2.0",
+        "@next/bundle-analyzer": "^9.1.2",
+        "cpx": "^1.5.0",
+        "cross-env": "^5.2.0",
+        "firebase-functions-test": "^0.1.6",
+        "firebase-tools": "^6.1.0",
+        "rimraf": "^2.6.0"
     }
-}
+}
diff --git a/packages/react-renderer-demo/src/app/next.config.js b/packages/react-renderer-demo/src/app/next.config.js
diff --git a/packages/react-renderer-demo/src/app/package.json b/packages/react-renderer-demo/src/app/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"dist/index.js": {`
`3`		`- "bundled": 346567,`
`4`		`- "minified": 141696,`
`5`		`- "gzipped": 39777`
	`3`	`+ "bundled": 354331,`
	`4`	`+ "minified": 147276,`
	`5`	`+ "gzipped": 42033`
`6`	`6`	`}`
`7`	`7`	`}`