@symbo.ls/create 2.11.222 → 2.11.236

package/dist/cjs/initEmotion.js

@@ -44,7 +44,8 @@ const initEmotion = (key, options = import_options.DESIGN_SYSTEM_OPTIONS) => {
   if (!initOptions.emotion)
     initOptions.emotion = import_emotion2.emotion;
   const registry = options.registry || (0, import_emotion.transformDOMQLEmotion)(initOptions.emotion, options);
-  const designSystem = options.designSystem || (options.defaultConfig ? (0, import_utils.deepClone)(import_default_config.default) : {});
+  const defaultDesignSystem = (0, import_utils.deepClone)(import_default_config.default);
+  const designSystem = options.useDefaultConfig ? (0, import_utils.deepMerge)(options.designSystem, defaultDesignSystem) : options.designSystem;
   const scratchSystem = (0, import_init.init)(designSystem, {
     key,
     emotion,

package/dist/cjs/options.js

@@ -30,7 +30,8 @@ const DESIGN_SYSTEM_OPTIONS = {
   useIconSprite: true,
   useSvgSprite: true,
   useDocumentTheme: true,
-  useFontImport: true
+  useFontImport: true,
+  useDefaultConfig: true
 };
 const CREATE_OPTIONS = {
   defaultConfig: true,

package/dist/cjs/router.js

@@ -71,7 +71,7 @@ const popStateRouter = (element, options) => {
   import_utils.window.onpopstate = (e) => {
     const { pathname, hash } = import_utils.window.location;
     const url = pathname + hash;
-    router(url, element, {}, { pushState: false, level: 0 });
+    router(url, element, {}, { pushState: false, scrollToTop: false, level: 0 });
   };
 };
 const injectRouterInLinkComponent = (routerOptions) => {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.11.222",
+  "version": "2.11.236",
   "license": "MIT",
-  "gitHead": "6e6a08383cbffe4c4ed682998b6c7610db57a000",
+  "gitHead": "d2a083322de551a55d184ccd6d3933ab465c209e",
   "files": [
     "src",
     "dist"

package/src/index.js

@@ -2,6 +2,7 @@
 
 import DOM from 'domql'
 import { deepMerge, isObject, isString } from '@domql/utils'
+// import { checkIfKeyIsComponent } from '@domql/element/dist/cjs/component'
 
 import * as utils from './utilImports'
 import * as uikit from '@symbo.ls/uikit'
@@ -22,6 +23,21 @@ const mergeWithLocalFile = (options, optionsExternalFile) => {
   return deepMerge(options, rcfile)
 }
 
+// const UIkitWithPrefix = () => {
+//   const newObj = {}
+//   for (const key in uikit) {
+//     if (Object.prototype.hasOwnProperty.call(uikit, key)) {
+//       if (checkIfKeyIsComponent(key)) {
+//         newObj[`smbls.${key}`] = uikit[key]
+//       } else {
+//         newObj[key] = uikit[key]
+//       }
+//     }
+//   }
+//   console.log(newObj, uikit)
+//   return newObj
+// }
+
 export const create = async (App, options = DEFAULT_CREATE_OPTIONS, optionsExternalFile) => {
   const appIsKey = isString(App)
   options = { ...DEFAULT_CREATE_OPTIONS, ...mergeWithLocalFile(options, optionsExternalFile) }
@@ -44,6 +60,7 @@ export const create = async (App, options = DEFAULT_CREATE_OPTIONS, optionsExter
   if (App && App.state) deepMerge(state, App.state)
 
   const pages = options.pages || {}
+  // const components = options.components ? { ...UIkitWithPrefix(), ...options.components } : UIkitWithPrefix()
   const components = options.components ? { ...uikit, ...options.components } : uikit
   const designSystem = scratcDesignhSystem || {}
   const snippets = { ...utils, ...utils.scratchUtils, ...(options.snippets || {}) }

package/src/initEmotion.js

@@ -3,7 +3,7 @@
 import { transformDOMQLEmotion } from '@domql/emotion'
 import { emotion as defaultEmotion } from '@symbo.ls/emotion'
 import { init } from '@symbo.ls/init'
-import { deepClone } from '@domql/utils'
+import { deepClone, deepMerge } from '@domql/utils'
 
 import { DESIGN_SYSTEM_OPTIONS } from './options'
 import DEFAULT_CONFIG from '@symbo.ls/default-config'
@@ -16,7 +16,8 @@ export const initEmotion = (key, options = DESIGN_SYSTEM_OPTIONS) => {
   if (!initOptions.emotion) initOptions.emotion = defaultEmotion
 
   const registry = options.registry || transformDOMQLEmotion(initOptions.emotion, options)
-  const designSystem = options.designSystem || (options.defaultConfig ? deepClone(DEFAULT_CONFIG) : {})
+  const defaultDesignSystem = deepClone(DEFAULT_CONFIG)
+  const designSystem = options.useDefaultConfig ? deepMerge(options.designSystem, defaultDesignSystem) : options.designSystem
 
   const scratchSystem = init(designSystem, {
     key,

package/src/options.js

@@ -8,7 +8,8 @@ export const DESIGN_SYSTEM_OPTIONS = {
   useIconSprite: true,
   useSvgSprite: true,
   useDocumentTheme: true,
-  useFontImport: true
+  useFontImport: true,
+  useDefaultConfig: true
 }
 
 export const CREATE_OPTIONS = {

package/src/router.js

@@ -52,7 +52,7 @@ export const popStateRouter = (element, options) => {
   window.onpopstate = e => {
     const { pathname, hash } = window.location
     const url = pathname + hash
-    router(url, element, {}, { pushState: false, level: 0 })
+    router(url, element, {}, { pushState: false, scrollToTop: false, level: 0 })
   }
 }