瀏覽代碼

Merge pull request #397 from WhatAKitty/Fix-immutable-error-after-updating-rn@0.35

Fix immutable error after updating rn@0.35
DanielZlotin 8 年之前
父節點
當前提交
c226aee92e
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3
    3
      src/deprecated/platformSpecificDeprecated.ios.js

+ 3
- 3
src/deprecated/platformSpecificDeprecated.ios.js 查看文件

@@ -184,10 +184,10 @@ function _mergeScreenSpecificSettings(screenID, screenInstanceID, params) {
184 184
     Object.assign(navigatorStyle, params.navigatorStyle);
185 185
   }
186 186
 
187
-  const navigatorEventID = screenInstanceID + '_events';
188
-  const navigatorButtons = Object.assign({}, screenClass.navigatorButtons);
187
+  let navigatorEventID = screenInstanceID + '_events';
188
+  let navigatorButtons = JSON.parse(JSON.stringify(screenClass.navigatorButtons));
189 189
   if (params.navigatorButtons) {
190
-    Object.assign(navigatorButtons, params.navigatorButtons);
190
+    navigatorButtons = JSON.parse(JSON.stringify(params.navigatorButtons));
191 191
   }
192 192
   if (navigatorButtons.leftButtons) {
193 193
     for (let i = 0; i < navigatorButtons.leftButtons.length; i++) {