groundfloor-react-ui 1.3.15 → 1.3.17

package/dist/index.es.js

@@ -443,9 +443,10 @@ ${({customStyles:e})=>e}
   //Set the styles from the default styles object
   ${({theme:e,defaultStyle:t})=>T(e,t)}
   &:disabled {
-    color: ${({disableColor:e})=>e||"#929eac"};
-    border: none;
+    color: #929eac;
+    border: 1px solid ${({theme:e})=>e.neutral["neutral-3"]};
     cursor: not-allowed;
+    ${({disableStyle:e})=>e}
   }
   &:hover {
     background-color: ${({theme:e,disabled:t,btnStyle:l})=>!t&&(l.color?l.color:e.primary["primary-1"])};
@@ -453,19 +454,14 @@ ${({customStyles:e})=>e}
 
     svg {
       path {
-        fill: ${({theme:e,disabled:t,btnStyle:l,disableColor:o})=>t?o||e.variant["neutral-1"]:l.color?l.backgroundColor:e.variant.white};
+        fill: ${({theme:e,disabled:t,btnStyle:l})=>!t&&(l.color?l.backgroundColor:e.variant.white)};
       }
     }
   }
-  svg {
-    path {
-      fill: ${({theme:e,disabled:t,disableColor:l})=>t&&l?l:e.variant["neutral-1"]};
-    }
-  }
 
   // custom styles
   ${({btnStyle:e})=>e}
-`,we=({btnStyle:e,isLoading:l,block:o,size:r,style:a,disabled:n,type:c,theme:s,id:d,disableColor:p,...m})=>{const u=b()||R,[g,f]=i(e.color?e.color:u.variant["primary-1"]);return t.createElement(Ae,z({id:d,block:o,defaultStyle:"button",style:a,size:r,disabled:n,type:c,btnStyle:e,isLoading:l,theme:s,disableColor:p,onMouseEnter:()=>!n&&f(e.backgroundColor?e.backgroundColor:u.variant.white),onMouseLeave:()=>!n&&f(e.color?e.color:u.variant["primary-1"])},m),l&&t.createElement("div",{style:{paddingRight:"10px",display:"flex",justifyContent:"center",alignItems:"center"}},t.createElement(pe,{theme:s,customStyles:{"background-color":g},size:16})," "),m.children," ")};we.propTypes={disabled:e.bool,size:e.oneOf(["sm","md","lg"]),block:e.bool,onClick:e.func,theme:e.object,type:e.string,btnStyle:e.object,id:e.string,disableColor:e.string},Ae.defaultProps={theme:R},we.defaultProps={theme:R,block:!1,disabled:!1,size:"md",onClick:void 0,btnStyle:{},id:"",disableColor:""};const Se=m.button`
+`,we=({btnStyle:e,isLoading:l,block:o,size:r,style:a,disabled:n,type:c,theme:s,id:d,disableStyle:p,...m})=>{const u=b()||R,[g,f]=i(e.color?e.color:u.variant["primary-1"]);return t.createElement(Ae,z({id:d,block:o,defaultStyle:"button",style:a,size:r,disabled:n,type:c,btnStyle:e,isLoading:l,theme:s,disableStyle:p,onMouseEnter:()=>!n&&f(e.backgroundColor?e.backgroundColor:u.variant.white),onMouseLeave:()=>!n&&f(e.color?e.color:u.variant["primary-1"])},m),l&&t.createElement("div",{style:{paddingRight:"10px",display:"flex",justifyContent:"center",alignItems:"center"}},t.createElement(pe,{theme:s,customStyles:{"background-color":g},size:16})," "),m.children," ")};we.propTypes={disabled:e.bool,size:e.oneOf(["sm","md","lg"]),block:e.bool,onClick:e.func,theme:e.object,type:e.string,btnStyle:e.object,id:e.string,disableStyle:e.object},Ae.defaultProps={theme:R},we.defaultProps={theme:R,block:!1,disabled:!1,size:"md",onClick:void 0,btnStyle:{},id:"",disableStyle:{}};const Se=m.button`
   background-color: ${({theme:e})=>e.primary["primary-1"]};
   color: ${({theme:e})=>e.additional.white};
   padding: 3px 14px;

package/dist/index.js

@@ -443,9 +443,10 @@ ${({customStyles:e})=>e}
   //Set the styles from the default styles object
   ${({theme:e,defaultStyle:t})=>P(e,t)}
   &:disabled {
-    color: ${({disableColor:e})=>e||"#929eac"};
-    border: none;
+    color: #929eac;
+    border: 1px solid ${({theme:e})=>e.neutral["neutral-3"]};
     cursor: not-allowed;
+    ${({disableStyle:e})=>e}
   }
   &:hover {
     background-color: ${({theme:e,disabled:t,btnStyle:l})=>!t&&(l.color?l.color:e.primary["primary-1"])};
@@ -453,19 +454,14 @@ ${({customStyles:e})=>e}
 
     svg {
       path {
-        fill: ${({theme:e,disabled:t,btnStyle:l,disableColor:a})=>t?a||e.variant["neutral-1"]:l.color?l.backgroundColor:e.variant.white};
+        fill: ${({theme:e,disabled:t,btnStyle:l})=>!t&&(l.color?l.backgroundColor:e.variant.white)};
       }
     }
   }
-  svg {
-    path {
-      fill: ${({theme:e,disabled:t,disableColor:l})=>t&&l?l:e.variant["neutral-1"]};
-    }
-  }
 
   // custom styles
   ${({btnStyle:e})=>e}
-`,xe=({btnStyle:e,isLoading:a,block:o,size:r,style:i,disabled:n,type:c,theme:d,id:s,disableColor:u,...p})=>{const f=l.useTheme()||H,[m,b]=t.useState(e.color?e.color:f.variant["primary-1"]);return g.default.createElement(ye,E({id:s,block:o,defaultStyle:"button",style:i,size:r,disabled:n,type:c,btnStyle:e,isLoading:a,theme:d,disableColor:u,onMouseEnter:()=>!n&&b(e.backgroundColor?e.backgroundColor:f.variant.white),onMouseLeave:()=>!n&&b(e.color?e.color:f.variant["primary-1"])},p),a&&g.default.createElement("div",{style:{paddingRight:"10px",display:"flex",justifyContent:"center",alignItems:"center"}},g.default.createElement(ne,{theme:d,customStyles:{"background-color":m},size:16})," "),p.children," ")};xe.propTypes={disabled:b.default.bool,size:b.default.oneOf(["sm","md","lg"]),block:b.default.bool,onClick:b.default.func,theme:b.default.object,type:b.default.string,btnStyle:b.default.object,id:b.default.string,disableColor:b.default.string},ye.defaultProps={theme:H},xe.defaultProps={theme:H,block:!1,disabled:!1,size:"md",onClick:void 0,btnStyle:{},id:"",disableColor:""};const Ce=h.default.button`
+`,xe=({btnStyle:e,isLoading:a,block:o,size:r,style:i,disabled:n,type:c,theme:d,id:s,disableStyle:u,...p})=>{const f=l.useTheme()||H,[m,b]=t.useState(e.color?e.color:f.variant["primary-1"]);return g.default.createElement(ye,E({id:s,block:o,defaultStyle:"button",style:i,size:r,disabled:n,type:c,btnStyle:e,isLoading:a,theme:d,disableStyle:u,onMouseEnter:()=>!n&&b(e.backgroundColor?e.backgroundColor:f.variant.white),onMouseLeave:()=>!n&&b(e.color?e.color:f.variant["primary-1"])},p),a&&g.default.createElement("div",{style:{paddingRight:"10px",display:"flex",justifyContent:"center",alignItems:"center"}},g.default.createElement(ne,{theme:d,customStyles:{"background-color":m},size:16})," "),p.children," ")};xe.propTypes={disabled:b.default.bool,size:b.default.oneOf(["sm","md","lg"]),block:b.default.bool,onClick:b.default.func,theme:b.default.object,type:b.default.string,btnStyle:b.default.object,id:b.default.string,disableStyle:b.default.object},ye.defaultProps={theme:H},xe.defaultProps={theme:H,block:!1,disabled:!1,size:"md",onClick:void 0,btnStyle:{},id:"",disableStyle:{}};const Ce=h.default.button`
   background-color: ${({theme:e})=>e.primary["primary-1"]};
   color: ${({theme:e})=>e.additional.white};
   padding: 3px 14px;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "groundfloor-react-ui",
   "description": "Official component library for Ground Floor",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "private": false,