Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
farfromrefug committed May 31, 2024
2 parents 56d7066 + 1814620 commit 3521b2c
Show file tree
Hide file tree
Showing 37 changed files with 4,399 additions and 5,035 deletions.
10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,19 @@ packages/**/*.d.ts
bin
build
Pods
!packages/platforms
!packages/*/platforms
/packages/**/*.aar
/packages/**/*.framework
/packages/**/*.xcframework
/demo-snippets/**/*.aar
*.xcuserdatad
/packages/README.md
packages/**/*js.map
packages/**/*js
packages/**/angular/*.json
packages/*.ngsummary.json
packages/*.metadata.json
packages/angular
packages/typings
packages/**/angular/*.json
packages/**/*.ngsummary.json
packages/**/*.metadata.json

/blueprint.md
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,36 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [14.1.24](https://github.com/nativescript-community/ui-pager/compare/v14.1.23...v14.1.24) (2024-05-14)

### Features

* padding support ([3624df8](https://github.com/nativescript-community/ui-pager/commit/3624df8330fe33cc5d8517f18ebe907af81216dd))

## [14.1.23](https://github.com/nativescript-community/ui-pager/compare/v14.1.22...v14.1.23) (2024-04-17)

### Bug Fixes

* **angular:** Correct initialisation issue with angular ([c83c292](https://github.com/nativescript-community/ui-pager/commit/c83c2926bf92959c9eda8e4d705248841ce6c37d))

## [14.1.22](https://github.com/nativescript-community/ui-pager/compare/v14.1.21...v14.1.22) (2024-03-22)

### Bug Fixes

* **ios:** page item not updating on change ([9a38a43](https://github.com/nativescript-community/ui-pager/commit/9a38a43e18170387f157ed173d21c02918d4c37a))

## [14.1.21](https://github.com/nativescript-community/ui-pager/compare/v14.1.20...v14.1.21) (2024-03-22)

### Bug Fixes

* **ios:** ensure all templates are registered ([658e9c2](https://github.com/nativescript-community/ui-pager/commit/658e9c27a10cd714ab43f6674fdbf1ddd9abc8ac))

## [14.1.20](https://github.com/nativescript-community/ui-pager/compare/v14.1.19...v14.1.20) (2024-03-01)

### Bug Fixes

* **ios:** correctly apply transformer if start index is not 0 ([59c55a8](https://github.com/nativescript-community/ui-pager/commit/59c55a87d5abd8c807a6b7a45440e783dae4ddb6))

## [14.1.19](https://github.com/nativescript-community/ui-pager/compare/v14.1.18...v14.1.19) (2024-02-15)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion demo-react
Submodule demo-react updated 1 files
+1 −1 tsconfig.json
14 changes: 6 additions & 8 deletions demo-snippets/vue/BasicPager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ export default {
data() {
return {
items: [
{title: "First", color: "#e67e22"},
{title: "Second", color: "#3498db"},
{title: "Third", color: "#e74c3c"},
{title: "Fourth", color: "#9b59b6"},
{ title: 'First', color: '#e67e22' },
{ title: 'Second', color: '#3498db' },
{ title: 'Third', color: '#e74c3c' },
{ title: 'Fourth', color: '#9b59b6' }
]
}
};
},
methods: {
moveTo3() {
Expand All @@ -46,7 +46,6 @@ export default {
</script>

<style lang="scss" scoped>
.page Label {
font-size: 35;
text-align: center;
Expand All @@ -55,5 +54,4 @@ export default {
color: #ffffff;
text-transform: uppercase;
}
</style>
</style>
15 changes: 7 additions & 8 deletions demo-snippets/vue/Indicator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,22 @@
</GridLayout>
</v-template>
</Pager>
<PagerIndicator pagerViewId="pager" type="fill" verticalAlignment="bottom" horizontalAlignment="center" marginBottom="10"/>
<Button row="1" text="Reset" @tap="resetPager" />
<PagerIndicator pagerViewId="pager" type="fill" verticalAlignment="bottom" horizontalAlignment="center" marginBottom="10" />
<Button row="1" text="Reset" @tap="resetPager" />
</GridLayout>
</Page>
</template>

<script>
export default {
data() {
return {
selectedIndex: 2,
items: [
{title: 'First', color: '#e67e22'},
{title: 'Second', color: '#3498db'},
{title: 'Third', color: '#e74c3c'},
{title: 'Fourth', color: '#9b59b6'},
{ title: 'First', color: '#e67e22' },
{ title: 'Second', color: '#3498db' },
{ title: 'Third', color: '#e74c3c' },
{ title: 'Fourth', color: '#9b59b6' }
]
};
},
Expand All @@ -38,7 +37,7 @@ export default {
this.selectedIndex = 0;
},
selectedIndexChange(args) {
console.log("SELECTED INDEX CHANGES", args.value)
console.log('SELECTED INDEX CHANGES', args.value);
this.selectedIndex = args.value;
}
}
Expand Down
21 changes: 9 additions & 12 deletions demo-snippets/vue/RenderIssue.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<template>
<Page>
<ActionBar>
Expand All @@ -20,7 +19,7 @@
</StackLayout>
<StackLayout marginBottom="50">
<Label :text="item.field3" />
<StackLayout v-show="item.field3" backgroundColor="blue" height="10" width="10"/>
<StackLayout v-show="item.field3" backgroundColor="blue" height="10" width="10" />
</StackLayout>
</StackLayout>
</v-template>
Expand All @@ -34,18 +33,16 @@ export default {
data() {
return {
items: [
{ field1: true, field2: true, field3: true},
{ field1: true, field2: true, field3: false},
{ field1: true, field2: false, field3: true},
{ field1: false, field2: true, field3: true},
{ field1: false, field2: true, field3: true},
{ field1: true, field2: true, field3: false},
{ field1: true, field2: true, field3: true },
{ field1: true, field2: true, field3: false },
{ field1: true, field2: false, field3: true },
{ field1: false, field2: true, field3: true },
{ field1: false, field2: true, field3: true },
{ field1: true, field2: true, field3: false }
]
}
};
}
};
</script>

<style lang="scss" scoped>
</style>
<style lang="scss" scoped></style>
6 changes: 2 additions & 4 deletions demo-snippets/vue/StaticPager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</ActionBar>

<StackLayout class="page">
<Pager height="100%" peaking="30" spacing="10">
<Pager height="100%" peaking="30">
<PagerItem backgroundColor="#e67e22"><Label text="First" /></PagerItem>
<PagerItem backgroundColor="#3498db"><Label text="Second" /></PagerItem>
<PagerItem backgroundColor="#e74c3c"><Label text="Third" /></PagerItem>
Expand All @@ -21,13 +21,11 @@ export default {};
</script>

<style lang="scss" scoped>
.page Label {
font-size: 35;
horizontal-alignment: center;
vertical-alignment: center;
color: #ffffff;
text-transform: uppercase;
}
</style>
</style>
17 changes: 7 additions & 10 deletions demo-snippets/vue/Transformer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,25 @@
</template>

<script>
import { Pager } from '@nativescript-community/ui-pager';
import transformer from '@nativescript-community/ui-pager/transformers/Scale';
Pager.registerTransformer('scale', transformer)
Pager.registerTransformer('scale', transformer);
export default {
data() {
return {
items: [
{title: "First", color: "#e67e22"},
{title: "Second", color: "#3498db"},
{title: "Third", color: "#e74c3c"},
{title: "Fourth", color: "#9b59b6"},
{ title: 'First', color: '#e67e22' },
{ title: 'Second', color: '#3498db' },
{ title: 'Third', color: '#e74c3c' },
{ title: 'Fourth', color: '#9b59b6' }
]
}
};
}
};
</script>

<style lang="scss" scoped>
.page Label {
font-size: 35;
text-align: center;
Expand All @@ -47,5 +45,4 @@ export default {
color: #ffffff;
text-transform: uppercase;
}
</style>
</style>
2 changes: 1 addition & 1 deletion demo-vue
Loading

0 comments on commit 3521b2c

Please sign in to comment.