refactor: more robust checking of boolean values (re nativescript-vue#171) (nativescript-vue#260)

msaelices · rigor789 · commit 0fdf81d7d9c3 · 2018-06-21T12:07:18.000+02:00
diff --git a/platform/nativescript/renderer/ViewNode.js b/platform/nativescript/renderer/ViewNode.js
@@ -3,6 +3,7 @@ import set from 'set-value'
 import { getViewMeta, normalizeElementName } from '../element-registry'
 import * as viewUtil from './utils'
 import { isAndroid, isIOS } from 'tns-core-modules/platform'
+import * as types from 'tns-core-modules/utils/types'
 
 const XML_ATTRIBUTES = Object.freeze([
   'style',
@@ -99,7 +100,7 @@ export default class ViewNode {
       } else {
         // detect expandable attrs for boolean values
         // See https://vuejs.org/v2/guide/components-props.html#Passing-a-Boolean
-        if (typeof this.nativeView[key] === 'boolean' && value === '') {
+        if (types.isBoolean(this.nativeView[key]) && value === '') {
           value = true
         }
 
diff --git a/platform/nativescript/runtime/modules/transition.js b/platform/nativescript/runtime/modules/transition.js
@@ -76,7 +76,9 @@ export function enter(vnode, toggleDisplay) {
 
   const beforeEnterHook = isAppear ? beforeAppear || beforeEnter : beforeEnter
   const enterHook = isAppear
-    ? typeof appear === 'function' ? appear : enter
+    ? typeof appear === 'function'
+      ? appear
+      : enter
     : enter
   const afterEnterHook = isAppear ? afterAppear || afterEnter : afterEnter
   const enterCancelledHook = isAppear
