Skip to content

Commit ef62fc6

Browse files
committed
chore: cleanup picker filter feature
1 parent ce7a334 commit ef62fc6

File tree

6 files changed

+38
-46
lines changed

6 files changed

+38
-46
lines changed

apps/demo/src/plugin-demos/picker.ts

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ import { PickerField } from '@nativescript/picker';
55
export function navigatingTo(args: EventData) {
66
const page = <Page>args.object;
77
page.bindingContext = new DemoModel();
8-
page.bindingContext.set('enableFilterText', 'Enable Filter');
98
}
109

11-
export class DemoModel extends DemoSharedPicker {}
10+
export class DemoModel extends DemoSharedPicker {
11+
enableFilter = false;
12+
enableFilterText = 'Enable Filter';
13+
toggleFilter(args: EventData) {
14+
const view: View = args.object as View;
15+
console.log('enableFilter', this.enableFilter);
16+
this.enableFilter = !this.enableFilter;
17+
this.notifyPropertyChange('enableFilter', this.enableFilter);
18+
this.notifyPropertyChange('enableFilterText', this.enableFilter ? 'Hide Filter' : 'Enable Filter');
19+
const picker: PickerField = view.page.getViewById('picker');
20+
picker.showPicker();
21+
}
1222

13-
export function showPicker(args: EventData) {
14-
const view: View = args.object as View;
15-
const picker: PickerField = view.page.getViewById('picker');
16-
picker.showPicker();
23+
showPicker(args: EventData) {
24+
const view: View = args.object as View;
25+
const picker: PickerField = view.page.getViewById('picker');
26+
picker.showPicker();
1727

18-
/*
19-
setTimeout(() => {
20-
closePicker(args)
21-
}, 3000)
22-
*/
23-
}
24-
25-
let showFilter = false;
26-
export function toggleFilter(args: EventData) {
27-
const view: View = args.object as View;
28-
console.error('enableFilter', showFilter);
29-
showFilter = !showFilter;
30-
view.page.bindingContext.set('enableFilter', showFilter);
31-
view.page.bindingContext.set('enableFilterText', showFilter ? 'Hide Filter' : 'Enable Filter');
32-
const picker: PickerField = view.page.getViewById('picker');
33-
picker.showPicker();
34-
}
28+
/*
29+
setTimeout(() => {
30+
closePicker(args)
31+
}, 3000)
32+
*/
33+
}
3534

36-
function closePicker(args: EventData) {
37-
const view: View = args.object as View;
38-
const picker: PickerField = view.page.getViewById('picker');
39-
picker.closePicker();
35+
closePicker(args: EventData) {
36+
const view: View = args.object as View;
37+
const picker: PickerField = view.page.getViewById('picker');
38+
picker.closePicker();
39+
}
4040
}

apps/demo/src/plugin-demos/picker.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<StackLayout class="p-20">
77
<ScrollView class="h-full">
88
<StackLayout>
9-
<Button text="{{ enableFilterText }}" tap="toggleFilter" />
9+
<Button text="{{ enableFilterText }}" tap="{{toggleFilter}}" />
1010

11-
<Button text="Show Picker Programatically" tap="showPicker" />
11+
<Button text="Show Picker Programatically" tap="{{showPicker}}" />
1212

1313
<picker:PickerField hintText="Search Items..." focusOnShow="true" filterKeyName="name" showFilter="{{ enableFilter }}" pickerTitle="Nativescript Picker" rowHeight="60" id="picker" hint="Click here" textField="name" padding="10" pickerOpened="{{ pickerOpened }}" pickerClosed="{{ pickerClosed }}"
1414
items="{{ pickerItems }}" >

package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"nativescript-vue": "~2.9.0",
4141
"nativescript-vue-template-compiler": "~2.9.0",
4242
"ng-packagr": "^15.0.0",
43-
"nx": "^15.4.2",
4443
"rxjs": "~7.5.0",
4544
"shorthash": "0.0.2",
4645
"simple-plist": "^1.1.0",
@@ -54,13 +53,6 @@
5453
"npx prettier --write"
5554
]
5655
},
57-
"contributors": [
58-
{
59-
"name": "KefahB",
60-
"email": "kefah.bader@gmail.com",
61-
"url": "https://github.com/kefahB"
62-
}
63-
],
6456
"dependencies": {
6557
"@nativescript/swift-ui": "^1.0.0-beta.0"
6658
}

packages/picker/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ export class PickerField extends TextField implements TemplatedItemsView {
410410
}
411411

412412
public static showFilterProperty = new Property<PickerField, boolean>({
413-
name: 'hideFilter',
413+
name: 'showFilter',
414414
defaultValue: false,
415415
valueConverter: booleanConverter,
416416
valueChanged: PickerField.showFilterChanged,

packages/picker/package.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@
2525
"name": "NativeScript",
2626
"email": "oss@nativescript.org"
2727
},
28+
"contributors": [
29+
{
30+
"name": "KefahB",
31+
"email": "kefah.bader@gmail.com",
32+
"url": "https://github.com/kefahB"
33+
}
34+
],
2835
"bugs": {
2936
"url": "https://github.com/NativeScript/plugins/issues"
3037
},

packages/picker/project.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,5 @@
6161
"lintFilePatterns": ["packages/picker/**/*.ts"]
6262
}
6363
}
64-
},
65-
"contributors": [
66-
{
67-
"name": "KefahB",
68-
"email": "kefah.bader@gmail.com",
69-
"url": "https://github.com/kefahB"
70-
}
71-
]
64+
}
7265
}

0 commit comments

Comments
 (0)