瀏覽代碼

Check if fab icon was resolved when creating fab

Guy Carmeli 7 年之前
父節點
當前提交
053fbf5aa9
共有 1 個文件被更改,包括 9 次插入2 次删除
  1. 9
    2
      src/deprecated/platformSpecificDeprecated.android.js

+ 9
- 2
src/deprecated/platformSpecificDeprecated.android.js 查看文件

@@ -375,9 +375,16 @@ function addNavigatorButtons(screen, sideMenuParams) {
375 375
 function getFab(screen) {
376 376
   if (screen.fab) {
377 377
     const fab = screen.fab;
378
-    fab.collapsedIcon = resolveAssetSource(fab.collapsedIcon).uri;
378
+    const collapsedIconUri = resolveAssetSource(fab.collapsedIcon);
379
+    if (!collapsedIconUri) {
380
+      return;
381
+    }
382
+    fab.collapsedIcon = collapsedIconUri.uri;
379 383
     if (fab.expendedIcon) {
380
-      fab.expendedIcon = resolveAssetSource(fab.expendedIcon).uri;
384
+      const expendedIconUri = resolveAssetSource(fab.expendedIcon);
385
+      if (expendedIconUri) {
386
+        fab.expendedIcon = expendedIconUri.ui;
387
+      }
381 388
     }
382 389
 
383 390
     if (fab.actions) {