fluent-styles 1.62.8 → 1.62.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -16,6 +16,7 @@ const styled = (Component, {
|
|
|
16
16
|
...(base || {})
|
|
17
17
|
};
|
|
18
18
|
const options = props;
|
|
19
|
+
const incomingStyle = options.style;
|
|
19
20
|
const cleanProps = {
|
|
20
21
|
...options
|
|
21
22
|
};
|
|
@@ -35,7 +36,7 @@ const styled = (Component, {
|
|
|
35
36
|
}
|
|
36
37
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
37
38
|
...cleanProps,
|
|
38
|
-
style: styles
|
|
39
|
+
style: [styles, incomingStyle]
|
|
39
40
|
});
|
|
40
41
|
};
|
|
41
42
|
StyledComponent.displayName = `Styled(${typeof Component === "string" ? Component : Component.displayName ?? Component.name ?? "Component"})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","_jsxRuntime","e","__esModule","default","styled","Component","base","variants","StyledComponent","props","styles","options","cleanProps","Object","keys","forEach","category","variantSelected","variantValue","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_jsxRuntime","e","__esModule","default","styled","Component","base","variants","StyledComponent","props","styles","options","incomingStyle","style","cleanProps","Object","keys","forEach","category","variantSelected","variantValue","assign","value","jsx","displayName","name","exports"],"sourceRoot":"../../../src","sources":["utiles/styled.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6C,IAAAC,WAAA,GAAAD,OAAA;AAAA,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAc7C,MAAMG,MAAM,GAAGA,CACXC,SAA2B,EAC3B;EAAEC,IAAI;EAAEC;AAAwB,CAAC,GAAG,CAAC,CAAC,KACrC;EACD,MAAMC,eAAe,GAAIC,KAAmC,IAAK;IAC7D,MAAMC,MAAa,GAAG;MAAE,IAAIJ,IAAI,IAAI,CAAC,CAAC;IAAE,CAAC;IACzC,MAAMK,OAAO,GAAGF,KAA4B;IAC5C,MAAMG,aAAa,GAAGD,OAAO,CAACE,KAAK;IACnC,MAAMC,UAAU,GAAG;MAAE,GAAGH;IAAQ,CAAC;IAEjC,IAAIJ,QAAQ,EAAE;MACVQ,MAAM,CAACC,IAAI,CAACT,QAAQ,CAAC,CAACU,OAAO,CAAEC,QAAQ,IAAK;QACxC,OAAOJ,UAAU,CAACI,QAAQ,CAAC;QAC3B,MAAMC,eAAe,GAAGR,OAAO,CAACO,QAAQ,CAAC;QACzC,MAAME,YAAY,GAAGb,QAAQ,CAACW,QAAQ,CAAC;QAEvC,IAAI,OAAOE,YAAY,KAAK,UAAU,EAAE;UACpC,MAAMP,KAAK,GAAGO,YAAY,CAACD,eAAe,EAAER,OAAO,CAAC;UACpD,IAAIE,KAAK,EAAEE,MAAM,CAACM,MAAM,CAACX,MAAM,EAAEG,KAAK,CAAC;QAC3C,CAAC,MAAM,IAAIO,YAAY,GAAGD,eAAe,CAAC,EAAE;UACxC,MAAMG,KAAK,GAAGF,YAAY,CAACD,eAAe,CAAC;UAC3CJ,MAAM,CAACM,MAAM,CAACX,MAAM,EAAE,OAAOY,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACH,eAAe,EAAER,OAAO,CAAC,GAAGW,KAAK,CAAC;QAChG;MACJ,CAAC,CAAC;IACN;IAED,oBAAO,IAAAtB,WAAA,CAAAuB,GAAA,EAAClB,SAAS;MAAA,GAAMS,UAAU;MAAQD,KAAK,EAAE,CAACH,MAAM,EAAEE,aAAa;IAAE,CAAE,CAAC;EAC9E,CAAC;EAEDJ,eAAe,CAACgB,WAAW,GAAG,UAC1B,OAAOnB,SAAS,KAAK,QAAQ,GAAGA,SAAS,GAAGA,SAAS,CAACmB,WAAW,IAAInB,SAAS,CAACoB,IAAI,IAAI,WAAW,GACnG;EAEH,OAAOjB,eAAe;AAC1B,CAAC;AAACkB,OAAA,CAAAtB,MAAA,GAAAA,MAAA","ignoreList":[]}
|
|
@@ -11,6 +11,7 @@ const styled = (Component, {
|
|
|
11
11
|
...(base || {})
|
|
12
12
|
};
|
|
13
13
|
const options = props;
|
|
14
|
+
const incomingStyle = options.style;
|
|
14
15
|
const cleanProps = {
|
|
15
16
|
...options
|
|
16
17
|
};
|
|
@@ -30,7 +31,7 @@ const styled = (Component, {
|
|
|
30
31
|
}
|
|
31
32
|
return /*#__PURE__*/_jsx(Component, {
|
|
32
33
|
...cleanProps,
|
|
33
|
-
style: styles
|
|
34
|
+
style: [styles, incomingStyle]
|
|
34
35
|
});
|
|
35
36
|
};
|
|
36
37
|
StyledComponent.displayName = `Styled(${typeof Component === "string" ? Component : Component.displayName ?? Component.name ?? "Component"})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","jsx","_jsx","styled","Component","base","variants","StyledComponent","props","styles","options","cleanProps","Object","keys","forEach","category","variantSelected","variantValue","
|
|
1
|
+
{"version":3,"names":["React","jsx","_jsx","styled","Component","base","variants","StyledComponent","props","styles","options","incomingStyle","style","cleanProps","Object","keys","forEach","category","variantSelected","variantValue","assign","value","displayName","name"],"sourceRoot":"../../../src","sources":["utiles/styled.tsx"],"mappings":";;AACA,OAAOA,KAAK,MAAyB,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAc7C,MAAMC,MAAM,GAAGA,CACXC,SAA2B,EAC3B;EAAEC,IAAI;EAAEC;AAAwB,CAAC,GAAG,CAAC,CAAC,KACrC;EACD,MAAMC,eAAe,GAAIC,KAAmC,IAAK;IAC7D,MAAMC,MAAa,GAAG;MAAE,IAAIJ,IAAI,IAAI,CAAC,CAAC;IAAE,CAAC;IACzC,MAAMK,OAAO,GAAGF,KAA4B;IAC5C,MAAMG,aAAa,GAAGD,OAAO,CAACE,KAAK;IACnC,MAAMC,UAAU,GAAG;MAAE,GAAGH;IAAQ,CAAC;IAEjC,IAAIJ,QAAQ,EAAE;MACVQ,MAAM,CAACC,IAAI,CAACT,QAAQ,CAAC,CAACU,OAAO,CAAEC,QAAQ,IAAK;QACxC,OAAOJ,UAAU,CAACI,QAAQ,CAAC;QAC3B,MAAMC,eAAe,GAAGR,OAAO,CAACO,QAAQ,CAAC;QACzC,MAAME,YAAY,GAAGb,QAAQ,CAACW,QAAQ,CAAC;QAEvC,IAAI,OAAOE,YAAY,KAAK,UAAU,EAAE;UACpC,MAAMP,KAAK,GAAGO,YAAY,CAACD,eAAe,EAAER,OAAO,CAAC;UACpD,IAAIE,KAAK,EAAEE,MAAM,CAACM,MAAM,CAACX,MAAM,EAAEG,KAAK,CAAC;QAC3C,CAAC,MAAM,IAAIO,YAAY,GAAGD,eAAe,CAAC,EAAE;UACxC,MAAMG,KAAK,GAAGF,YAAY,CAACD,eAAe,CAAC;UAC3CJ,MAAM,CAACM,MAAM,CAACX,MAAM,EAAE,OAAOY,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACH,eAAe,EAAER,OAAO,CAAC,GAAGW,KAAK,CAAC;QAChG;MACJ,CAAC,CAAC;IACN;IAED,oBAAOnB,IAAA,CAACE,SAAS;MAAA,GAAMS,UAAU;MAAQD,KAAK,EAAE,CAACH,MAAM,EAAEE,aAAa;IAAE,CAAE,CAAC;EAC9E,CAAC;EAEDJ,eAAe,CAACe,WAAW,GAAG,UAC1B,OAAOlB,SAAS,KAAK,QAAQ,GAAGA,SAAS,GAAGA,SAAS,CAACkB,WAAW,IAAIlB,SAAS,CAACmB,IAAI,IAAI,WAAW,GACnG;EAEH,OAAOhB,eAAe;AAC1B,CAAC;AAED,SAASJ,MAAM","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../../../src/utiles/styled.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,KAAK,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAEhD,UAAU,aAAa;IACnB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC;SAC1E,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC;KACnD,CAAC;CACL;AAED,QAAA,MAAM,MAAM,6EAEY,aAAa;;;;;
|
|
1
|
+
{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../../../src/utiles/styled.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,KAAK,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAEhD,UAAU,aAAa;IACnB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC;SAC1E,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC;KACnD,CAAC;CACL;AAED,QAAA,MAAM,MAAM,6EAEY,aAAa;;;;;CAgCpC,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
package/package.json
CHANGED
package/src/utiles/styled.tsx
CHANGED
|
@@ -20,6 +20,7 @@ const styled = <P extends object>(
|
|
|
20
20
|
const StyledComponent = (props: P & { ref?: React.Ref<any> }) => {
|
|
21
21
|
const styles: Style = { ...(base || {}) };
|
|
22
22
|
const options = props as Record<string, any>;
|
|
23
|
+
const incomingStyle = options.style;
|
|
23
24
|
const cleanProps = { ...options };
|
|
24
25
|
|
|
25
26
|
if (variants) {
|
|
@@ -38,7 +39,7 @@ const styled = <P extends object>(
|
|
|
38
39
|
});
|
|
39
40
|
}
|
|
40
41
|
|
|
41
|
-
|
|
42
|
+
return <Component {...(cleanProps as P)} style={[styles, incomingStyle]} />;
|
|
42
43
|
};
|
|
43
44
|
|
|
44
45
|
StyledComponent.displayName = `Styled(${
|