From 8e10a0cfd1c7471fa9b3a1023e13f9b3d5406121 Mon Sep 17 00:00:00 2001
From: halfnelson <dpershouse@gmail.com>
Date: Sun, 1 Mar 2020 10:41:59 +1000
Subject: [PATCH] Array parent properties are re-assigned each time

Fixes #113 and #118
---
 demo/app/App.svelte                    |  2 ++
 demo/app/pages/SegmentedBarPage.svelte | 19 +++++++++++++++++++
 demo/package-lock.json                 |  6 +++---
 demo/package.json                      |  4 ++--
 src/dom/native/NativeElementNode.ts    |  6 +++++-
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 demo/app/pages/SegmentedBarPage.svelte

diff --git a/demo/app/App.svelte b/demo/app/App.svelte
index e384380f..20e41e13 100644
--- a/demo/app/App.svelte
+++ b/demo/app/App.svelte
@@ -7,6 +7,7 @@
                 <stackLayout>
                     <label text="ListView" class:current={$current_page == ListViewPage} padding="10" on:tap="{() => gotoPage(ListViewPage)}" />
                      <label text="Tabs" class:current={$current_page == TabsPage} padding="10" on:tap="{() => gotoPage(TabsPage)}" />
+                     <label text="SegmentedBar" class:current={$current_page == SegmentedBarPage} padding="10" on:tap="{() => gotoPage(SegmentedBarPage)}" />
                 </stackLayout>
             </scrollView>
         </gridLayout>
@@ -21,6 +22,7 @@
     import * as nav from './Nav'
     import ListViewPage from './pages/ListViewPage.svelte'
     import TabsPage from './pages/TabsPage.svelte'
+    import SegmentedBarPage from './pages/SegmentedBarPage.svelte'
 
     function gotoPage(page) {
         drawer.closeDrawer();
diff --git a/demo/app/pages/SegmentedBarPage.svelte b/demo/app/pages/SegmentedBarPage.svelte
new file mode 100644
index 00000000..18220371
--- /dev/null
+++ b/demo/app/pages/SegmentedBarPage.svelte
@@ -0,0 +1,19 @@
+<script>
+  import Header from "../Header.svelte";
+  let show = true
+</script>
+
+<page>
+  <Header title="Segmented Bar" />
+
+  <stackLayout class="p-20">
+  <button text="Tap me twice" on:tap="{() => show=!show}" />
+  {#if show}
+    <segmentedBar>
+        <segmentedBarItem title="Test 1" />
+        <segmentedBarItem title="Test 2" />
+        <segmentedBarItem title="Test 3" />
+    </segmentedBar>
+    {/if}
+  </stackLayout>
+</page>
diff --git a/demo/package-lock.json b/demo/package-lock.json
index 715c48c0..2110c66d 100644
--- a/demo/package-lock.json
+++ b/demo/package-lock.json
@@ -6523,9 +6523,9 @@
       "integrity": "sha512-yHBw3qnwcIu7IqMoFsc6uutJoUAFi8Iazkp8Z0sheBlQNbOYfQjSAw8eyyzQstUdaibK8CBA25SLOTPULEUQrA=="
     },
     "svelte-native-preprocessor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/svelte-native-preprocessor/-/svelte-native-preprocessor-0.1.4.tgz",
-      "integrity": "sha512-FhLPlwQ6rYtxCO6t8zEEyqj9PqM4OLXLfltbDOhj2w1h7ekkxcQpymf9Qd6EmdmlANQL8biK9Dz70huDIWL0lg==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/svelte-native-preprocessor/-/svelte-native-preprocessor-0.1.6.tgz",
+      "integrity": "sha512-WcqYhah3o6kOI62VwNyiuCCq5yk3YuiXd/s2odedH2d8cplNJ31qpwZOTliB5BqsCy5F6Hyumd3flv1DvjMtzw==",
       "dev": true
     },
     "tapable": {
diff --git a/demo/package.json b/demo/package.json
index 516e6738..9e083d6e 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -33,8 +33,8 @@
     "nativescript-dev-webpack": "1.3.0",
     "svelte": "~3.16.4",
     "svelte-loader": "halfnelson/svelte-loader#fix-virtual-purge",
-    "svelte-native-preprocessor": "~0.1.4",
+    "svelte-native-preprocessor": "~0.1.6",
     "typescript": "3.7.2"
   },
   "readme": "NativeScript Application"
-}
\ No newline at end of file
+}
diff --git a/src/dom/native/NativeElementNode.ts b/src/dom/native/NativeElementNode.ts
index 3a67a80b..2c9df59a 100644
--- a/src/dom/native/NativeElementNode.ts
+++ b/src/dom/native/NativeElementNode.ts
@@ -19,7 +19,11 @@ function setOnArrayProp(parent: any, value: any, propName: string, build: (value
     if (!current || !current.push) {
         parent[propName] = build ? build(value) : [value];
     } else {
-        current.push(value)
+        if (current instanceof ObservableArray) {
+            current.push(value)
+        } else {
+            parent[propName] = [...current, value];
+        }
     }
 }