Skip to content

Commit

Permalink
Merge branch 'fix/segmentedBar'
Browse files Browse the repository at this point in the history
  • Loading branch information
halfnelson committed Mar 1, 2020
2 parents 5ce22d5 + 8e10a0c commit 1937660
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 6 deletions.
2 changes: 2 additions & 0 deletions demo/app/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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();
Expand Down
19 changes: 19 additions & 0 deletions demo/app/pages/SegmentedBarPage.svelte
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 5 additions & 1 deletion src/dom/native/NativeElementNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
}

Expand Down

0 comments on commit 1937660

Please sign in to comment.