Skip to content

Commit 2160715

Browse files
farfromrefugfarfromrefug
committed
Merge branch 'master' of github.com:nativescript-community/ui-material-components
# Conflicts: # tools
2 parents 1e8e19a + e9f577d commit 2160715

Some content is hidden

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

59 files changed

+445
-116
lines changed

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,30 @@
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.0.29](https://github.com/nativescript-community/ui-material-component/compare/v7.0.28...v7.0.29) (2022-10-24)
7+
8+
9+
### Bug Fixes
10+
11+
* **bottomnavigationbar:** select tab native view ([7a0debe](https://github.com/nativescript-community/ui-material-component/commit/7a0debee97405416ef1f0a8eb9f69d7989732c9b))
12+
* **BottomSheet:** Back-to-blade motion is fluid ([09f7e2f](https://github.com/nativescript-community/ui-material-component/commit/09f7e2f77b44fa820ff628f4f0c1f6f42083fe9a))
13+
* **textfield:** wrong hint colors ([8055347](https://github.com/nativescript-community/ui-material-component/commit/805534779fc91b25ff095242ca4cf30b76286404))
14+
15+
16+
17+
18+
19+
## [7.0.28](https://github.com/nativescript-community/ui-material-component/compare/v7.0.27...v7.0.28) (2022-09-16)
20+
21+
22+
### Bug Fixes
23+
24+
* correctly search for the tab fragment ([#405](https://github.com/nativescript-community/ui-material-component/issues/405)) ([2e91650](https://github.com/nativescript-community/ui-material-component/commit/2e916508622faf06e9bfc76de9c8c0b31cb417c1))
25+
26+
27+
28+
29+
630
## [7.0.27](https://github.com/nativescript-community/ui-material-component/compare/v7.0.26...v7.0.27) (2022-09-16)
731

832

‎demo-snippets/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@
3838
"@nativescript-community/ui-material-textfield": "link:../packages/textfield",
3939
"@nativescript-community/ui-material-textview": "link:../packages/textview",
4040
"@nativescript/hook": "~2.0.0",
41-
"copy-webpack-plugin": "^10.2.4"
42-
},
43-
"devDependencies": {
44-
"nativescript-vue-template-compiler": "~2.9.0",
41+
"copy-webpack-plugin": "^10.2.4",
42+
43+
"nativescript-vue-template-compiler": "~2.9.3",
4544
"scss-symbols-parser": "^2.0.1",
4645
"string-replace-loader": "^3.1.0"
46+
},
47+
"devDependencies": {
4748
}
4849
}

‎demo-snippets/vue/Tabs.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<NavigationButton text="Back" android.systemIcon="ic_menu_back" @tap="onNavigationButtonTap" />
55
</ActionBar>
66
<GridLayout rows="*, 0" backgroundColor="red">
7-
<MDTabs ref="tabs" :swipeEnabled="false" :animationEnabled="false" :unloadOnTabChange="false" backgroundColor="green" selectedIndex="1">
7+
<MDTabs ref="tabs" :swipeEnabled="false" :animationEnabled="true" :unloadOnTabChange="false" backgroundColor="green" v-model="selectedIndex">
88
<!-- The bottom tab UI is created via MDTabStrip (the containier) and MDTabStripItem (for each tab)-->
99
<MDTabStrip>
1010
<MDTabStripItem>
@@ -27,14 +27,19 @@
2727
<Page>
2828
<GridLayout backgroundColor="red" @loaded="onLoaded('red')">
2929
<Label text="Home Page" class="h2 text-center"></Label>
30+
<Button text="change" @tap="selectedIndex=1"/>
3031
</GridLayout>
3132
</Page>
3233
</Frame>
3334
</MDTabContentItem>
3435
<MDTabContentItem>
35-
<GridLayout backgroundColor="green" @loaded="onLoaded('green')">
36+
<Frame id="inner2">
37+
<Page>
38+
<GridLayout backgroundColor="green" @loaded="onLoaded('green')">
3639
<Label text="Account Page" class="h2 text-center" @tap="addPage"></Label>
37-
</GridLayout>
40+
</GridLayout>
41+
</Page>
42+
</Frame>
3843
</MDTabContentItem>
3944
</MDTabs>
4045
</GridLayout>
@@ -43,7 +48,7 @@
4348

4449
<script lang="ts">
4550
import { Frame } from '@nativescript/core/ui/frame';
46-
import { TabContentItem, Tabs } from '@nativescript-community/ui-material-tabs/';
51+
import { TabContentItem, Tabs } from '@nativescript-community/ui-material-tabs';
4752
import { Color, EventData, GridLayout, Label, StackLayout } from '@nativescript/core';
4853
4954
import Vue from 'vue';
@@ -55,6 +60,7 @@ export default Vue.extend({
5560
data() {
5661
return {
5762
title,
63+
selectedIndex:0,
5864
addThirdItem: false
5965
};
6066
},

‎demo-snippets/webpack.config.vue.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const NsVueTemplateCompiler = require('nativescript-vue-template-compiler');
1+
const NsVueTemplateCompiler = require('../demo-vue/node_modules/nativescript-vue-template-compiler');
22
const { readFileSync } = require('fs');
33
const CopyWebpackPlugin = require('copy-webpack-plugin');
44

@@ -32,12 +32,18 @@ NsVueTemplateCompiler.registerElement('MDSlider', () => require('@nativescript-c
3232
event: 'valueChange'
3333
}
3434
});
35+
NsVueTemplateCompiler.registerElement('MDTabs', () => require('@nativescript-community/ui-material-tabs').Slider, {
36+
model: {
37+
prop: 'selectedIndex',
38+
event: 'selectedIndexChange'
39+
}
40+
});
3541

3642
module.exports = (env, webpack) => {
3743
const platform = env && ((env.android && 'android') || (env.ios && 'ios'));
3844
webpack.chainWebpack((config) => {
39-
const symbolsParser = require('scss-symbols-parser');
40-
const mdiSymbols = symbolsParser.parseSymbols(readFileSync(resolve(__dirname, 'node_modules/@mdi/font/scss/_variables.scss')).toString());
45+
const symbolsParser = require('../demo-vue/node_modules/scss-symbols-parser');
46+
const mdiSymbols = symbolsParser.parseSymbols(readFileSync(resolve(__dirname, '../demo-vue/node_modules/@mdi/font/scss/_variables.scss')).toString());
4147
const mdiIcons = JSON.parse(`{${mdiSymbols.variables[mdiSymbols.variables.length - 1].value.replace(/" (F|0)(.*?)([,\n]|$)/g, '": "$1$2"$3')}}`);
4248

4349
const scssPrepend = `$mdi-fontFamily: ${platform === 'android' ? 'materialdesignicons-webfont' : 'Material Design Icons'};`;
@@ -50,7 +56,7 @@ module.exports = (env, webpack) => {
5056
.end()
5157
.test(/\.(ts|js|scss|css|vue)$/)
5258
.use('string-replace-loader')
53-
.loader(resolve(__dirname, 'node_modules/string-replace-loader'))
59+
.loader(resolve(__dirname, '../demo-vue/node_modules/string-replace-loader'))
5460
.options({
5561
search: 'mdi-([a-z0-9-_]+)',
5662
replace: (match, p1, offset, str) => {
@@ -65,7 +71,7 @@ module.exports = (env, webpack) => {
6571
{
6672
patterns: [
6773
{
68-
from: resolve(__dirname, 'node_modules/@mdi/font/fonts/materialdesignicons-webfont.ttf'),
74+
from: resolve(__dirname, '../demo-vue/node_modules/@mdi/font/fonts/materialdesignicons-webfont.ttf'),
6975
to: 'fonts'
7076
}
7177
]

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
]
1818
}
1919
},
20-
"version": "7.0.27"
20+
"version": "7.0.29"
2121
}

‎package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"postinstall": "npm run setup",
3636
"publish": "npm run setup && npm run clean && npm run build.all && lerna publish --create-release=github --force-publish",
3737
"readme": "node ./tools/readme.js",
38-
"setup": "npm run submodules && ts-patch install",
38+
"setup": "npm run submodules && ts-patch install -s",
3939
"start": "./node_modules/.bin/ntl -A -s 15 -o",
4040
"submodules": "git submodule update --init",
4141
"sync": "node ./tools/sync.js",
@@ -81,11 +81,6 @@
8181
"watch": "Watch for changes in the plugin source and re-build."
8282
}
8383
},
84-
"dependenciesMeta": {
85-
"@nativescript-community/plugin-seed-tools": {
86-
"injected": true
87-
}
88-
},
8984
"engines": {
9085
"npm": "please use yarn or pnpm",
9186
"yarn": ">= 1.19.1",

‎packages/activityindicator/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.0.29](https://github.com/nativescript-community/ui-material-components/compare/v7.0.28...v7.0.29) (2022-10-24)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-activityindicator
9+
10+
11+
12+
13+
14+
## [7.0.28](https://github.com/nativescript-community/ui-material-components/compare/v7.0.27...v7.0.28) (2022-09-16)
15+
16+
**Note:** Version bump only for package @nativescript-community/ui-material-activityindicator
17+
18+
19+
20+
21+
622
## [7.0.27](https://github.com/nativescript-community/ui-material-components/compare/v7.0.26...v7.0.27) (2022-09-16)
723

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

‎packages/activityindicator/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/activityindicator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-activityindicator",
3-
"version": "7.0.27",
3+
"version": "7.0.29",
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.0.27"
50+
"@nativescript-community/ui-material-core": "^7.0.29"
5151
},
5252
"gitHead": "240457b7952c4f0258aabc46615de63d1473ead1"
5353
}

‎packages/bottom-navigation/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.0.29](https://github.com/nativescript-community/ui-material-components/compare/v7.0.28...v7.0.29) (2022-10-24)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-bottom-navigation
9+
10+
11+
12+
13+
14+
## [7.0.28](https://github.com/nativescript-community/ui-material-components/compare/v7.0.27...v7.0.28) (2022-09-16)
15+
16+
**Note:** Version bump only for package @nativescript-community/ui-material-bottom-navigation
17+
18+
19+
20+
21+
622
## [7.0.27](https://github.com/nativescript-community/ui-material-components/compare/v7.0.26...v7.0.27) (2022-09-16)
723

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

‎packages/bottom-navigation/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bottom-navigation/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-bottom-navigation",
3-
"version": "7.0.27",
3+
"version": "7.0.29",
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.0.27",
55-
"@nativescript-community/ui-material-core-tabs": "^7.0.27"
54+
"@nativescript-community/ui-material-core": "^7.0.29",
55+
"@nativescript-community/ui-material-core-tabs": "^7.0.29"
5656
},
5757
"gitHead": "240457b7952c4f0258aabc46615de63d1473ead1"
5858
}

‎packages/bottomnavigationbar/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.0.29](https://github.com/nativescript-community/ui-material-components/compare/v7.0.28...v7.0.29) (2022-10-24)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomnavigationbar
9+
10+
11+
12+
13+
14+
## [7.0.28](https://github.com/nativescript-community/ui-material-components/compare/v7.0.27...v7.0.28) (2022-09-16)
15+
16+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomnavigationbar
17+
18+
19+
20+
21+
622
## [7.0.27](https://github.com/nativescript-community/ui-material-components/compare/v7.0.26...v7.0.27) (2022-09-16)
723

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

‎packages/bottomnavigationbar/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bottomnavigationbar/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-bottomnavigationbar",
3-
"version": "7.0.27",
3+
"version": "7.0.29",
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.0.27"
55+
"@nativescript-community/ui-material-core": "^7.0.29"
5656
},
5757
"gitHead": "240457b7952c4f0258aabc46615de63d1473ead1"
5858
}

‎packages/bottomsheet/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.0.29](https://github.com/nativescript-community/ui-material-components/compare/v7.0.28...v7.0.29) (2022-10-24)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
9+
10+
11+
12+
13+
14+
## [7.0.28](https://github.com/nativescript-community/ui-material-components/compare/v7.0.27...v7.0.28) (2022-09-16)
15+
16+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
17+
18+
19+
20+
21+
622
## [7.0.27](https://github.com/nativescript-community/ui-material-components/compare/v7.0.26...v7.0.27) (2022-09-16)
723

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

‎packages/bottomsheet/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export interface BottomSheetOptions {
7474
//(iOS only) A Boolean value that controls whether the height of the keyboard should affect the bottom sheet's frame when the keyboard shows on the screen. (Default: true)
7575
onChangeState?: onChangeStateBottomSheet;
7676
// One works to be called on the scroll of the sheet. Parameters: state (CLOSED, DRAGGING, DRAGGING, COLLAPSED) and slideOffset is the new offset of this bottom sheet within [-1,1] range. Offset increases as this bottom sheet is moving upward. From 0 to 1 the sheet is between collapsed and expanded states and from -1 to 0 it is between hidden and collapsed states.
77+
canTouchBehind?: boolean //(Android only) allows to interact with the screen behind the sheet. For it to work properly need dismissOnBackgroundTap set to true.
7778
}
7879
```
7980

‎packages/bottomsheet/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bottomsheet/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript-community/ui-material-bottomsheet",
3-
"version": "7.0.27",
3+
"version": "7.0.29",
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.0.27"
49+
"@nativescript-community/ui-material-core": "^7.0.29"
5050
},
5151
"gitHead": "240457b7952c4f0258aabc46615de63d1473ead1"
5252
}

‎packages/button/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.0.29](https://github.com/nativescript-community/ui-material-components/compare/v7.0.28...v7.0.29) (2022-10-24)
7+
8+
**Note:** Version bump only for package @nativescript-community/ui-material-button
9+
10+
11+
12+
13+
14+
## [7.0.28](https://github.com/nativescript-community/ui-material-components/compare/v7.0.27...v7.0.28) (2022-09-16)
15+
16+
**Note:** Version bump only for package @nativescript-community/ui-material-button
17+
18+
19+
20+
21+
622
## [7.0.27](https://github.com/nativescript-community/ui-material-components/compare/v7.0.26...v7.0.27) (2022-09-16)
723

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

0 commit comments

Comments
 (0)