remove extra getters

Author: mydearxym

containers/Sidebar/PinButton.js

@@ -3,9 +3,9 @@ import styled from 'styled-components'
 import { PinIcon } from '../../components/Icons'
 
 const StyledPin = styled.div`
-  color: ${props => (props.isPin ? props.theme.sidebar.pin_active : 'grey')};
-  visibility: ${props => (props.isOpen ? 'visible' : 'hidden')};
-  opacity: ${props => (props.isOpen ? 1 : 0)};
+  color: ${props => (props.pin ? props.theme.sidebar.pin_active : 'grey')};
+  visibility: ${props => (props.open ? 'visible' : 'hidden')};
+  opacity: ${props => (props.open ? 1 : 0)};
   position: absolute;
   font-size: 25px;
   right: 10px;

containers/Sidebar/Sidebar.js

@@ -5,7 +5,7 @@ const SideBar = styled.div`
   position: fixed;
   height: 100vh;
   top: 0;
-  width: ${props => (props.isOpen ? '256px' : '56px')};
+  width: ${props => (props.open ? '256px' : '56px')};
   background: ${props => props.theme.sidebar.bg};
   border-color: ${props => props.theme.sidebar.border_color};
   z-index: 1000;

containers/Sidebar/index.js

@@ -47,10 +47,10 @@ const MenuIcon = ({ name }) => {
   }
 }
 
-const MenuList = ({ items, isOpen }) => {
+const MenuList = ({ items, open }) => {
   const listItems = items.map(item => (
     <li key={item.id}>
-      {isOpen ? (
+      {open ? (
         <span>
           <Link href={item.target.href} as={item.target.as}>
             <span>
@@ -85,14 +85,14 @@ class SidebarContainer extends React.Component {
 
     return (
       <Sidebar
-        isOpen={sidebar.isOpen}
+        open={sidebar.open}
         onMouseEnter={logic.enterSidebar}
         onMouseLeave={logic.leaveSidebar}
       >
         <div>
           <PinButton
-            isOpen={sidebar.isOpen}
-            isPin={sidebar.isPin}
+            open={sidebar.open}
+            pin={sidebar.pin}
             onClick={logic.pin}
           />
           <I18n {...lang.title} />
@@ -102,7 +102,7 @@ class SidebarContainer extends React.Component {
           <br />
           <br />
           <br />
-          <MenuList items={sidebar.menuItems} isOpen={sidebar.isOpen} />
+          <MenuList items={sidebar.menuItemsData} open={sidebar.open} />
         </div>
       </Sidebar>
     )

containers/Sidebar/logic.js

@@ -18,22 +18,21 @@ export const leaveSidebar2 = debounce(() => {
 */
 
 export function pin() {
-  debug('pin: ', !sidebar.isPin)
-  sidebar.markState('pin', !sidebar.isPin)
+  debug('pin: ', !sidebar.pin)
+  sidebar.markState('pin', !sidebar.pin)
 }
 
 export function enterSidebar() {
   sidebar.markState('open', true)
 }
 
 export function leaveSidebar() {
-  if (!sidebar.isPin) {
+  if (!sidebar.pin) {
     sidebar.markState('open', false)
   }
 }
 
 export function markLoading() {
-  /* debug('leaveSidebar >>', store.sidebar.menuItems.toJSON()) */
   /* sidebar.markLoading() */
   debug('markLoading')
   sidebar.markLoading()

stores/AppStore/index.js

@@ -15,7 +15,7 @@ const debug = makeDebugger('S:AppStore')
 
 const AppStore = t
   .model({
-    sidebar: t.optional(SidebarStore, { allMenuItems: [] }),
+    sidebar: t.optional(SidebarStore, { menuItems: [] }),
     // header: t...,
     // banner: t...,
     body: t.optional(BodyStore, {}),

stores/AppStore/index.test.js

@@ -10,6 +10,6 @@ const langSetup = {
 }
 
 it('mini test', () => {
-  const app = AppStore.create({ allMenuItems: [], appLangs: langSetup })
+  const app = AppStore.create({ menuItems: [], appLangs: langSetup })
   expect(app.version).toBe('0.0.1')
 })

stores/SidebarStore/index.js

@@ -14,10 +14,9 @@ const debug = makeDebugger('S:SidebarStore')
 // TODO: test/include sidebarStore and MenuItem
 const SidebarStore = t
   .model('SidebarStore', {
-    allMenuItems: t.optional(t.array(MenuItem), []), // complex data
+    menuItems: t.optional(t.array(MenuItem), []), // complex data
     open: t.optional(t.boolean, false),
     pin: t.optional(t.boolean, false),
-    // isPin: t.boolean, // should be in view
     // theme: t.string, // view staff
     // curSelectItem: t.string, // view staff
     // searchBox: t.string, // complex data
@@ -34,14 +33,8 @@ const SidebarStore = t
     get langs() {
       return self.app.langs
     },
-    get isOpen() {
-      return self.open
-    },
-    get isPin() {
-      return self.pin
-    },
-    get menuItems() {
-      return self.allMenuItems.toJSON()
+    get menuItemsData() {
+      return self.menuItems.toJSON()
     },
     get getLoading() {
       return self.loading
@@ -53,7 +46,7 @@ const SidebarStore = t
   .actions(self => ({
     loadAllMenuItem() {
       debug('loadAllMenuItem ...')
-      self.allMenuItems = fakeMenuItems
+      self.menuItems = fakeMenuItems
     },
 
     markLoading() {

stores/SidebarStore/index.test.js

@@ -8,8 +8,8 @@ import SidebarStore from './index'
 it('sidebar store create', () => {
   const sidebar = SidebarStore.create({}, {})
 
-  expect(sidebar.menuItems.length).toBe(0)
+  expect(sidebar.menuItemsData.length).toBe(0)
 
   sidebar.loadAllMenuItem()
-  expect(sidebar.menuItems.length).toBe(5)
+  expect(sidebar.menuItemsData.length).toBe(5)
 })