Merge pull request #249 from data-driven-forms/fix-select-clear-icon

rvsia · web-flow · commit 5791712a0714 · 2019-12-03T19:35:42.000+01:00
fix(pf4): fixed clearable icon position for select.
diff --git a/packages/pf4-component-mapper/demo/demo-schemas/sandbox.js b/packages/pf4-component-mapper/demo/demo-schemas/sandbox.js
@@ -249,7 +249,7 @@ const output = {
                   title: 'Dropdown',
                   dataType: 'string',
                   isSearchable: true,
-                  isClearable: false,
+                  isClearable: true,
                   multi: true,
                   component: components.SELECT_COMPONENT,
                   loadOptions: asyncLoadOptions,
diff --git a/packages/pf4-component-mapper/demo/index.html b/packages/pf4-component-mapper/demo/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/@patternfly/patternfly@2.41.0/patternfly-base.css"/>
+  <link rel="stylesheet" type="text/css" href="https://unpkg.com/@patternfly/patternfly@2.43.0/patternfly-base.css"/>
   <title>Data driven forms</title>
 </head>
 <body>
diff --git a/packages/pf4-component-mapper/src/form-fields/select/select-styles.scss b/packages/pf4-component-mapper/src/form-fields/select/select-styles.scss
@@ -43,6 +43,10 @@
       .ddorg__pf4-component-mapper__select__indicators {
           padding-right: 6px;
           z-index: 1;
+          >button.pf-c-button.pf-m-plain {
+            display: flex;
+            justify-content: center;
+          }
           .ddorg__pf4-component-mapper__select__indicator-separator {
               display: none;
           }
@@ -53,13 +57,6 @@
                   fill: var(--pf-global--Color--dark-100);
               }
           }
-          button.pf-c-button.pf-m-plain {
-            padding-right: 0.5rem;
-            padding-left: 1rem;
-            margin-left: auto;
-            padding-bottom: 0;
-            margin-right: 0.5rem;
-        }
       }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@`
`43`	`43`	`.ddorg__pf4-component-mapper__select__indicators {`
`44`	`44`	`padding-right: 6px;`
`45`	`45`	`z-index: 1;`
	`46`	`+ >button.pf-c-button.pf-m-plain {`
	`47`	`+ display: flex;`
	`48`	`+ justify-content: center;`
	`49`	`+ }`
`46`	`50`	`.ddorg__pf4-component-mapper__select__indicator-separator {`
`47`	`51`	`display: none;`
`48`	`52`	`}`
`@@ -53,13 +57,6 @@`
`53`	`57`	`fill: var(--pf-global--Color--dark-100);`
`54`	`58`	`}`
`55`	`59`	`}`
`56`		`- button.pf-c-button.pf-m-plain {`
`57`		`- padding-right: 0.5rem;`
`58`		`- padding-left: 1rem;`
`59`		`- margin-left: auto;`
`60`		`- padding-bottom: 0;`
`61`		`- margin-right: 0.5rem;`
`62`		`- }`
`63`	`60`	`}`
`64`	`61`	`}`
`65`	`62`