review commit 3

brave · Sep 13, 2017 · e54ce52 · e54ce52
1 parent 1c51823
commit e54ce52
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/app/common/lib/bookmarkToolbarUtil.js b/app/common/lib/bookmarkToolbarUtil.js
@@ -16,6 +16,9 @@ const padding = parseInt(globalStyles.spacing.bookmarksItemPadding, 10) * 2
 const itemMargin = parseInt(globalStyles.spacing.bookmarksItemMargin, 10)
 const toolbarPadding = parseInt(globalStyles.spacing.bookmarksToolbarPadding)
 const overflowButtonWidth = parseInt(globalStyles.spacing.bookmarksToolbarOverflowButtonWidth, 10)
+const chevronMargin = parseInt(globalStyles.spacing.bookmarksItemChevronMargin)
+const chevronFontSize = parseInt(globalStyles.spacing.bookmarksItemChevronFontSize)
+const chevronWidth = chevronMargin + chevronFontSize
 
 const getBookmarkKeys = (width, bookmarks) => {
   if (bookmarks == null) {
@@ -41,10 +44,11 @@ const getBookmarkKeys = (width, bookmarks) => {
   let i = 0
   for (let item of bookmarks) {
     let iconWidth
+    const isFolder = bookmarkFoldersUtil.isFolder(item)
 
     if (onlyText) {
       iconWidth = 0
-    } else if (textAndFavicon || bookmarkFoldersUtil.isFolder(item)) {
+    } else if (textAndFavicon || isFolder) {
       iconWidth = iconSize + itemMargin
     } else if (onlyFavicon) {
       iconWidth = iconSize
@@ -59,11 +63,15 @@ const getBookmarkKeys = (width, bookmarks) => {
     } else if (onlyFavicon) {
       extraWidth = padding + iconWidth
 
-      if (bookmarkFoldersUtil.isFolder(item)) {
+      if (isFolder) {
         extraWidth += item.get('width')
       }
     }
 
+    if (isFolder) {
+      extraWidth += chevronWidth
+    }
+
     extraWidth = Math.min(extraWidth, maxWidth)
     widthAccountedFor += extraWidth + margin
 

diff --git a/test/unit/app/browser/reducers/bookmarkFoldersReducerTest.js b/test/unit/app/browser/reducers/bookmarkFoldersReducerTest.js
@@ -22,7 +22,7 @@ describe('bookmarkFoldersReducer unit test', function () {
     windows: [
       {
         windowId: 1,
-        width: 70,
+        width: 80,
         bookmarksToolbar: {
           toolbar: [],
           other: []
@@ -40,7 +40,7 @@ describe('bookmarkFoldersReducer unit test', function () {
     windows: [
       {
         windowId: 1,
-        width: 70,
+        width: 80,
         bookmarksToolbar: {
           toolbar: [],
           other: []