dirk-cfx-react 1.0.62 → 1.0.64
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.
- package/dist/components/index.cjs.map +1 -1
- package/dist/components/index.js.map +1 -1
- package/dist/hooks/index.cjs.map +1 -1
- package/dist/hooks/index.js.map +1 -1
- package/dist/index.cjs +8 -3
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/dist/providers/index.cjs +8 -3
- package/dist/providers/index.cjs.map +1 -1
- package/dist/providers/index.d.cts +2 -0
- package/dist/providers/index.d.ts +2 -0
- package/dist/providers/index.js +8 -3
- package/dist/providers/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -2323,10 +2323,15 @@ function DirkProvider(props) {
|
|
|
2323
2323
|
primaryShade,
|
|
2324
2324
|
colors: {
|
|
2325
2325
|
...theme_default.colors,
|
|
2326
|
-
...customTheme
|
|
2326
|
+
...customTheme,
|
|
2327
2327
|
// Custom theme colors will override/extend base colors
|
|
2328
|
-
|
|
2329
|
-
|
|
2328
|
+
...props.themeOverride?.colors
|
|
2329
|
+
// Props theme colors will override/extend previous colors
|
|
2330
|
+
},
|
|
2331
|
+
...props.themeOverride
|
|
2332
|
+
// Props theme will override/extend the entire theme
|
|
2333
|
+
}), [primaryColor, primaryShade, customTheme, props.themeOverride]);
|
|
2334
|
+
console.log(mergedTheme);
|
|
2330
2335
|
useEffect(() => {
|
|
2331
2336
|
document.fonts.ready.then(() => {
|
|
2332
2337
|
document.body.style.fontFamily = game === "rdr3" ? '"Red Dead", sans-serif' : game === "fivem" ? '"Akrobat Regular", sans-serif' : "sans-serif";
|