Moves bookmark text calculation into the state

Resolves brave#9611 Auditors: Test Plan:
NejcZdovc · Aug 7, 2017 · a2fc1f6 · a2fc1f6
1 parent 1bab9a7
commit a2fc1f6
Show file tree

Hide file tree

Showing 6 changed files with 18,169 additions and 1 deletion.
diff --git a/app/browser/reducers/bookmarksReducer.js b/app/browser/reducers/bookmarksReducer.js
@@ -95,6 +95,20 @@ const bookmarksReducer = (state, action, immutableAction) => {
           state = bookmarksState.removeBookmark(state, bookmarkKey)
         }
         state = bookmarkUtil.updateActiveTabBookmarked(state)
+        break
+      }
+    case appConstants.APP_ON_BOOKMARK_TEXT_CALC:
+      {
+        const values = action.get('values') || Immutable.List()
+
+        if (values == null) {
+          break
+        }
+
+        values.forEach((item) => {
+          state = bookmarksState.setTextWidth(state, item.get('key'), item.get('width'))
+        })
+
         break
       }
   }

diff --git a/app/common/state/bookmarksState.js b/app/common/state/bookmarksState.js
@@ -298,6 +298,17 @@ const bookmarksState = {
 
     const cache = bookmarkOrderCache.getBookmarksByParentId(state, folderKey)
     return cache.map((item) => bookmarksState.getBookmark(state, item.get('key')))
+  },
+
+  setTextWidth: (state, bookmarkKey, width) => {
+    let bookmark = bookmarksState.getBookmark(state, bookmarkKey)
+
+    if (bookmark.isEmpty()) {
+      return state
+    }
+
+    return state.setIn([STATE_SITES.BOOKMARKS, bookmarkKey, 'width'], width)
+
   }
 }
 

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -1600,6 +1600,17 @@ const appActions = {
       destinationKey,
       prepend
     })
+  },
+
+  /**
+   * Dispatches a message that saves new text width values
+   * @param values{Array} - Contains objects with key and width
+   */
+  onBookmarkTextCalc: function (values) {
+    dispatch({
+      actionType: appConstants.APP_ON_BOOKMARK_TEXT_CALC,
+      values
+    })
   }
 }
 

diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
@@ -150,7 +150,8 @@ const appConstants = {
   APP_REMOVE_BOOKMARK_FOLDER: _,
   APP_REMOVE_BOOKMARK: _,
   APP_MOVE_BOOKMARK_FOLDER: _,
-  APP_MOVE_BOOKMARK: _
+  APP_MOVE_BOOKMARK: _,
+  APP_ON_BOOKMARK_TEXT_CALC: _
 }
 
 module.exports = mapValuesByKeys(appConstants)
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -26,6 +26,7 @@ const windowActions = require('../actions/windowActions')
 const bookmarkFoldersState = require('../../app/common/state/bookmarkFoldersState')
 const bookmarksState = require('../../app/common/state/bookmarksState')
 const bookmarkUtil = require('../../app/common/lib/bookmarkUtil')
+const textCalculator = require('../lib/textCalculator')
 
 let windowState = Immutable.fromJS({
   activeFrameKey: null,
@@ -816,6 +817,45 @@ const doAction = (action) => {
         }
         break
       }
+    case appConstants.APP_ADD_BOOKMARK:
+    case appConstants.APP_EDIT_BOOKMARK:
+      {
+        const bookmark = action.siteDetail
+        let result = Immutable.List()
+
+        if (bookmark == null) {
+          break
+        }
+
+        if (Immutable.List.isList(bookmark)) {
+          action.get('siteDetail', Immutable.List()).forEach((item) => {
+            if (item.get('parentId', 0) === 0) {
+              const key = bookmarkUtil.getKey(item)
+              result = result.push({
+                key: key,
+                width: textCalculator.calculateTextWidth(bookmark.get('title') || bookmark.get('location'))
+              })
+            }
+          })
+        } else {
+          if (bookmark.get('parentId', 0) === 0) {
+            const key = bookmarkUtil.getKey(bookmark)
+            result = result.push({
+              key: key,
+              width: textCalculator.calculateTextWidth(bookmark.get('title') || bookmark.get('location'))
+            })
+          }
+        }
+
+        appActions.onBookmarkTextCalc(result)
+        break
+      }
+    case appConstants.APP_ADD_BOOKMARK_FOLDER:
+    case appConstants.APP_EDIT_BOOKMARK_FOLDER:
+      {
+        console.log(textCalculator.calculateTextWidth('test'))
+        break
+      }
     default:
       break
   }