src/modules: simplify arguments for Header, Menu, MenuItem and Logo

Author: jaeh

src/modules/Header.mjs

@@ -1,14 +1,15 @@
 export const View = (props = {}, children = []) => {
   CHECK_PROPS(props, propTypes, 'Header')
 
-  const { logo, menu, logotext, ...state } = props
+  const { logo, menu, logotext, root, theme, hash, url } = props
+
   if (!logo && !menu && !logotext) {
     return
   }
 
   return header({ class: 'Header' }, [
-    (logo || logotext) && Logo({ root: state.root, theme: state.theme, img: logo, text: logotext }),
-    menu && Menu({ state, items: menu }),
+    (logo || logotext) && Logo({ root, theme, logo, logotext }),
+    menu && Menu({ url, hash, root, items: menu }),
     children,
   ])
 }

src/modules/Logo.mjs

@@ -1,2 +1,2 @@
-export const View = ({ img, text, ...state }) =>
-  Link({ to: state.root, class: 'Logo' }, [img && Img(img), text && span(text)])
+export const View = ({ logo, logotext, ...state }) =>
+  Link({ to: state.root, class: 'Logo' }, [logo && Img(logo), logotext && span(logotext)])

src/modules/Menu.mjs

@@ -1,8 +1,9 @@
 export const View = (props = {}) => {
   CHECK_PROPS(props, propTypes, 'Menu')
-  const { class: className = 'Menu', collapse = true, items, state } = props
 
-  let { url, hash, root } = state
+  const { class: className = 'Menu', collapse = true, items, state } = props
+  const { hash, root } = state
+  let { url } = state
 
   if (hash && !url.endsWith(hash)) {
     url += `#${hash}`

src/modules/MenuItem.mjs

@@ -1,12 +1,13 @@
 export const View = props => {
   CHECK_PROPS(props, propTypes, 'MenuItem', true)
+
   const { text, items = [], url, root, parentTo = undefined, collapse, ...item } = props
 
   const p = {
     class: {},
   }
 
-  let to = item.to
+  let { to } = item
 
   if (root && to.startsWith('/')) {
     to = to.substr(1)