Merge branch 'dev' of github.com:pedronauck/docz into dev

* 'dev' of github.com:pedronauck/docz: fix(docz-core): entries not initialized on build (#725) fix(docz-theme-default): apply ignore in props parsing (#723) chore(docz-theme-default): search icon and sidebar top border. (#721) chore(docz-theme-default): export enhance from docz-theme-default (#715) fix(docz-theme-default): stop nested ul from rendering flat (#714) fix(docz-theme-default): mobile menu following anchor clicks (#713)
doczjs · Mar 26, 2019 · 6334083 · 6334083
2 parents abfbbb5 + 3e99db0
commit 6334083
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/core/docz-core/src/states/entries.ts b/core/docz-core/src/states/entries.ts
@@ -38,6 +38,7 @@ export const state = (entries: Entries, config: Config): State => {
     start: async params => {
       const update = updateEntries(entries)
 
+      update(params);
       watcher.on('add', async () => update(params))
       watcher.on('change', async () => update(params))
       watcher.on('unlink', async () => update(params))

diff --git a/core/docz-core/src/states/props.ts b/core/docz-core/src/states/props.ts
@@ -9,12 +9,12 @@ import { Config } from '../config/argv'
 import { docgen } from '../utils/docgen'
 
 const getPattern = (config: Config) => {
-  const { typescript } = config
+  const { typescript, ignore } = config
   return [
     typescript ? '**/*.{ts,tsx}' : '**/*.{js,jsx,mjs}',
     '!**/node_modules',
     '!**/doczrc.js',
-  ]
+  ].concat(ignore.map(entry => `!**/${entry}`))
 }
 
 export const mapToArray = (map: any = []) =>

diff --git a/core/docz-theme-default/src/components/shared/Logo/index.tsx b/core/docz-theme-default/src/components/shared/Logo/index.tsx
@@ -43,6 +43,8 @@ const Wrapper = styled.div<WrapperProps>`
       height: ${p => (p.showBg ? '3px' : 0)};
     }
   }
+
+  ${get('styles.logo')};
 `
 
 const LogoImg = styled('img')`

diff --git a/core/docz-theme-default/src/components/shared/Search/index.tsx b/core/docz-theme-default/src/components/shared/Search/index.tsx
@@ -20,7 +20,7 @@ const Wrapper = styled.div`
 
 const Icon = styled(SearchIcon)`
   stroke: ${sidebarText};
-  width: 20px;
+  min-width: 20px;
   opacity: 0.5;
 `
 

diff --git a/core/docz-theme-default/src/components/shared/Sidebar/index.tsx b/core/docz-theme-default/src/components/shared/Sidebar/index.tsx
@@ -45,6 +45,7 @@ const Wrapper = styled.div<WrapperProps>`
 
   @media screen and (max-width: ${breakpoints.desktop - 1}px) {
     transform: translateX(${p => (p.opened ? '-100%' : '0')});
+    position: ${p => (p.opened ? 'auto' : 'fixed')};
   }
 
   ${get('styles.sidebar')};

diff --git a/core/docz-theme-default/src/components/ui/UnorderedList.tsx b/core/docz-theme-default/src/components/ui/UnorderedList.tsx
@@ -13,4 +13,8 @@ export const UnorderedList = styled.ul`
   }
 
   ${get('styles.ul')};
+
+  ul li {
+    padding-left: 25px;
+  }
 `
diff --git a/core/docz-theme-default/src/index.tsx b/core/docz-theme-default/src/index.tsx
@@ -16,7 +16,7 @@ const Theme: SFC = ({ children }) => (
   </ThemeProvider>
 )
 
-const enhance = theme(config, ({ mode, codemirrorTheme, ...config }) => ({
+export const enhance = theme(config, ({ mode, codemirrorTheme, ...config }) => ({
   ...config,
   mode,
   codemirrorTheme: codemirrorTheme || `docz-${mode}`,
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,8 @@ const Wrapper = styled.div<WrapperProps>` @@
           height: ${p => (p.showBg ? '3px' : 0)};
         }
       }
+      ${get('styles.logo')};
     `
     const LogoImg = styled('img')`
@@ Expand Down @@