Skip to content

Commit d7c7a6a

Browse files
farfromrefugfarfromrefug
committed
Merge branch 'master' of github.com:nativescript-community/ui-material-components
2 parents 6c3c5ad + db798d3 commit d7c7a6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+275
-56
lines changed

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-component/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
### Bug Fixes
9+
10+
* **dialogs:** autoFocus not working ([c722b59](https://github.com/nativescript-community/ui-material-component/commit/c722b59ae31d6b721b346fb2e16fb381f950790d))
11+
12+
## [7.2.66](https://github.com/nativescript-community/ui-material-component/compare/v7.2.65...v7.2.66) (2024-10-08)
13+
14+
### Bug Fixes
15+
16+
* **bottom-navigation:** consistent styling on iOS 18 ([c29f593](https://github.com/nativescript-community/ui-material-component/commit/c29f5936b5c0bddf7b457eb4f711d2c5eac92598))
17+
618
## [7.2.65](https://github.com/nativescript-community/ui-material-component/compare/v7.2.64...v7.2.65) (2024-09-29)
719

820
### Bug Fixes

‎docs/assets/navigation.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/search.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "7.2.65",
2+
"version": "7.2.67",
33
"$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
44
"packages": [
55
"packages/*"

‎packages/activityindicator/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-activityindicator
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-activityindicator
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-activityindicator

‎packages/activityindicator/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-activityindicator",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Activity Indicator expresses an unspecified wait time.",
55
"main": "./index",
66
"sideEffects": false,
@@ -47,7 +47,7 @@
4747
"readmeFilename": "README.md",
4848
"homepage": "https://nativescript-community.github.io/ui-material-components/modules/_nativescript_community_ui_material_activityindicator.html",
4949
"dependencies": {
50-
"@nativescript-community/ui-material-core": "^7.2.65"
50+
"@nativescript-community/ui-material-core": "^7.2.67"
5151
},
5252
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5353
}

‎packages/bottom-navigation/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-bottom-navigation
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-bottom-navigation
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-bottom-navigation

‎packages/bottom-navigation/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-bottom-navigation",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Bottom Navigation bars allow movement between primary destinations in an app. Tapping on a bottom navigation icon takes you directly to the associated view or refreshes the currently active view.",
55
"main": "bottomnavigation",
66
"sideEffects": false,
@@ -51,8 +51,8 @@
5151
},
5252
"readmeFilename": "README.md",
5353
"dependencies": {
54-
"@nativescript-community/ui-material-core": "^7.2.65",
55-
"@nativescript-community/ui-material-core-tabs": "^7.2.65"
54+
"@nativescript-community/ui-material-core": "^7.2.67",
55+
"@nativescript-community/ui-material-core-tabs": "^7.2.67"
5656
},
5757
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5858
}

‎packages/bottomnavigationbar/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomnavigationbar
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomnavigationbar
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-bottomnavigationbar

‎packages/bottomnavigationbar/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-bottomnavigationbar",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Bottom Navigation bars allow movement between primary destinations in an app. Tapping on a bottom navigation icon takes you directly to the associated view or refreshes the currently active view.",
55
"main": "bottomnavigationbar",
66
"sideEffects": false,
@@ -52,7 +52,7 @@
5252
},
5353
"readmeFilename": "README.md",
5454
"dependencies": {
55-
"@nativescript-community/ui-material-core": "^7.2.65"
55+
"@nativescript-community/ui-material-core": "^7.2.67"
5656
},
5757
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5858
}

‎packages/bottomsheet/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet

‎packages/bottomsheet/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-bottomsheet",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Bottom Sheets slide up from the bottom of the screen to reveal more content. Bottom sheets integrate with the app to display supporting content or present deep-linked content from other apps.",
55
"main": "./bottomsheet",
66
"sideEffects": false,
@@ -46,7 +46,7 @@
4646
},
4747
"readmeFilename": "README.md",
4848
"dependencies": {
49-
"@nativescript-community/ui-material-core": "^7.2.65"
49+
"@nativescript-community/ui-material-core": "^7.2.67"
5050
},
5151
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5252
}

‎packages/button/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-button
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-button
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-button

‎packages/button/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-button",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Buttons allow users to take actions, and make choices, with a single tap.",
55
"main": "./button",
66
"sideEffects": false,
@@ -47,7 +47,7 @@
4747
"readmeFilename": "README.md",
4848
"dependencies": {
4949
"@nativescript-community/text": "^1.5.2",
50-
"@nativescript-community/ui-material-core": "^7.2.65"
50+
"@nativescript-community/ui-material-core": "^7.2.67"
5151
},
5252
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5353
}

‎packages/cardview/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-cardview
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-cardview
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-cardview

‎packages/cardview/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-cardview",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Cards contain content and actions about a single subject.",
55
"main": "./cardview",
66
"sideEffects": false,
@@ -46,7 +46,7 @@
4646
},
4747
"readmeFilename": "README.md",
4848
"dependencies": {
49-
"@nativescript-community/ui-material-core": "^7.2.65"
49+
"@nativescript-community/ui-material-core": "^7.2.67"
5050
},
5151
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5252
}

‎packages/core-tabs/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-core-tabs
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-core-tabs
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-core-tabs

‎packages/core-tabs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-core-tabs",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Core Tabs component",
55
"main": "./index",
66
"sideEffects": false,
@@ -39,7 +39,7 @@
3939
"repository": "https://github.com/nativescript-community/ui-material-components",
4040
"readmeFilename": "README.md",
4141
"dependencies": {
42-
"@nativescript-community/ui-material-core": "^7.2.65"
42+
"@nativescript-community/ui-material-core": "^7.2.67"
4343
},
4444
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
4545
}

‎packages/core-tabs/platforms/android/java/com/nativescript/material/core/TabsBar.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ public interface TabColorizer {
7474

7575
private int mTitleOffset;
7676

77+
private boolean mIgnoreScrollEventsUntilNextStateChange = false;
78+
7779
private boolean mDistributeEvenly = true;
7880

7981
private TabItemSpec[] mTabItems;
@@ -159,6 +161,15 @@ public float getTabTextFontSize(){
159161
return mTabStrip.getTabTextFontSize();
160162
}
161163

164+
public void forceTransitionToPosition(int position){
165+
mIgnoreScrollEventsUntilNextStateChange = true;
166+
final int tabStripChildCount = mTabStrip.getChildCount();
167+
if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
168+
return;
169+
}
170+
mTabStrip.onTabsViewPagerPageChanged(position, 0);
171+
}
172+
162173
/**
163174
* Sets the associated view pager. Note that the assumption here is that the
164175
* pager content (number of tabs and tab titles) does not change after this
@@ -418,7 +429,7 @@ private class InternalViewPagerListener extends OnPageChangeCallback {
418429
@Override
419430
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
420431
int tabStripChildCount = mTabStrip.getChildCount();
421-
if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
432+
if (mIgnoreScrollEventsUntilNextStateChange || (tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
422433
return;
423434
}
424435
mTabStrip.onTabsViewPagerPageChanged(position, positionOffset);
@@ -429,6 +440,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
429440

430441
@Override
431442
public void onPageScrollStateChanged (int state) {
443+
mIgnoreScrollEventsUntilNextStateChange = false;
432444
mScrollState = state;
433445
}
434446
}

‎packages/core/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-core
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-core
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-core

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-core",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Core component",
55
"main": "./index",
66
"sideEffects": false,

‎packages/dialogs/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-dialogs
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-dialogs
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-dialogs

‎packages/dialogs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-dialogs",
3-
"version": "7.2.65",
3+
"version": "7.2.67",
44
"description": "Material Design Dialogs inform users about a task and can contain critical information, require decisions, or involve multiple tasks.",
55
"main": "./dialogs",
66
"sideEffects": false,
@@ -43,8 +43,8 @@
4343
"license": "Apache-2.0",
4444
"readmeFilename": "README.md",
4545
"dependencies": {
46-
"@nativescript-community/ui-material-core": "^7.2.65",
47-
"@nativescript-community/ui-material-textfield": "^7.2.65"
46+
"@nativescript-community/ui-material-core": "^7.2.67",
47+
"@nativescript-community/ui-material-textfield": "^7.2.67"
4848
},
4949
"gitHead": "65eb2d66b4128ce58b4d3e35c83a68a6f921222c"
5050
}

‎packages/floatingactionbutton/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.2.67](https://github.com/nativescript-community/ui-material-components/compare/v7.2.66...v7.2.67) (2024-10-31)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-floatingactionbutton
9+
10+
## [7.2.66](https://github.com/nativescript-community/ui-material-components/compare/v7.2.65...v7.2.66) (2024-10-08)
11+
12+
**Note:** Version bump only for package @nativescript-community/ui-material-floatingactionbutton
13+
614
## [7.2.65](https://github.com/nativescript-community/ui-material-components/compare/v7.2.64...v7.2.65) (2024-09-29)
715

816
**Note:** Version bump only for package @nativescript-community/ui-material-floatingactionbutton

0 commit comments

Comments
 (0)