From 7c611053e47705fa6eeefaaf10f6f0beb65db249 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 13:24:00 +0000 Subject: [PATCH 1/3] build(deps-dev): bump rollup from 2.20.0 to 2.21.0 Bumps [rollup](https://github.com/rollup/rollup) from 2.20.0 to 2.21.0. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v2.20.0...v2.21.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index de8d0961ac2..8e248f09148 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14583,9 +14583,9 @@ } }, "rollup": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.20.0.tgz", - "integrity": "sha512-hkbp//ne1om8+PQRpd81zk0KDvbJxkLZdZJh1ZNxjd1EkI0H1TmYuHqqXx88yciS+5YnMom3geubQjTeeUnNNw==", + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.21.0.tgz", + "integrity": "sha512-BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ==", "dev": true, "requires": { "fsevents": "~2.1.2" diff --git a/package.json b/package.json index e6934258951..a7d0d100d40 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "npm-run-all": "^4.1.5", "nyc": "^15.1.0", "request-promise-native": "^1.0.8", - "rollup": "^2.20.0", + "rollup": "^2.21.0", "rollup-plugin-babel": "^4.4.0", "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-node-resolve": "^5.2.0", From cf39004ab9bd93f8701bb3e9cb3ed667f83d6edb Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Wed, 8 Jul 2020 16:29:11 -0400 Subject: [PATCH 2/3] test: fix up shortcut tests --- tests/Resources/ti.ui.shortcut.addontest.js | 28 ++++++------ tests/Resources/ti.ui.shortcutitem.test.js | 47 ++++++++++----------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/tests/Resources/ti.ui.shortcut.addontest.js b/tests/Resources/ti.ui.shortcut.addontest.js index d023e3c3252..81f2139c62c 100644 --- a/tests/Resources/ti.ui.shortcut.addontest.js +++ b/tests/Resources/ti.ui.shortcut.addontest.js @@ -20,17 +20,19 @@ if (OS_ANDROID) { } } -// Create basic shortcut item. -const shortcutItem = Ti.UI.createShortcutItem({ - id: 'test_shortcut', - title: 'Test Shortcut', - description: 'Test shortcut description', - data: { test_data: 'data' } -}); - -describe('Titanium.UI.Shortcut', () => { +describe.android('Titanium.UI.Shortcut', () => { + // Create basic shortcut item. + let shortcutItem; + before(() => { + shortcutItem = Ti.UI.createShortcutItem({ + id: 'test_shortcut', + title: 'Test Shortcut', + description: 'Test shortcut description', + data: { test_data: 'data' } + }); + }); - it.android('createShortcut', () => { + it('createShortcut', () => { should(Ti.UI.createShortcutItem).not.be.undefined(); should(Ti.UI.createShortcut).be.a.Function(); @@ -43,7 +45,7 @@ describe('Titanium.UI.Shortcut', () => { should(shortcut.apiName).be.eql('Ti.UI.Shortcut'); }); - it.android('removeAll', () => { + it('removeAll', () => { if (!androidCompatible) { return; @@ -61,7 +63,7 @@ describe('Titanium.UI.Shortcut', () => { shortcut.removeAll(); }); - it.android('remove', () => { + it('remove', () => { if (!androidCompatible) { return; @@ -85,7 +87,7 @@ describe('Titanium.UI.Shortcut', () => { should(shortcut.items).be.lessThan(existingShortcuts); }); - it.android('add', () => { + it('add', () => { if (!androidCompatible) { return; diff --git a/tests/Resources/ti.ui.shortcutitem.test.js b/tests/Resources/ti.ui.shortcutitem.test.js index 12e11be71f0..b1e6db92b9a 100644 --- a/tests/Resources/ti.ui.shortcutitem.test.js +++ b/tests/Resources/ti.ui.shortcutitem.test.js @@ -11,38 +11,37 @@ const should = require('./utilities/assertions'); -describe('Titanium.UI.ShortcutItem', () => { +describe.android('Titanium.UI.ShortcutItem', () => { - describe.android('createShortcutItem', () => { + it('createShortcutItem', () => { should(Ti.UI.createShortcutItem).not.be.undefined(); should(Ti.UI.createShortcutItem).be.a.Function(); + }); - it.android('basic shortcut item', () => { - - // Create shortcut item. - const item = Ti.UI.createShortcutItem({ - id: 'test_shortcut', - title: 'Test Shortcut', - description: 'Test shortcut description', - data: { test_data: 'data' } - }); - should(item).be.a.Object(); + it('basic shortcut item', () => { + // Create shortcut item. + const item = Ti.UI.createShortcutItem({ + id: 'test_shortcut', + title: 'Test Shortcut', + description: 'Test shortcut description', + data: { test_data: 'data' } + }); + should(item).be.a.Object(); - // Verify `apiName`. - should(item).have.readOnlyProperty('apiName').which.is.a.String(); - should(item.apiName).be.eql('Ti.UI.ShortcutItem'); + // Verify `apiName`. + should(item).have.readOnlyProperty('apiName').which.is.a.String(); + should(item.apiName).be.eql('Ti.UI.ShortcutItem'); - // Verify `id`. - should(item.id).be.eql('test_shortcut'); + // Verify `id`. + should(item.id).be.eql('test_shortcut'); - // Verify `title`. - should(item.title).be.eql('Test Shortcut'); + // Verify `title`. + should(item.title).be.eql('Test Shortcut'); - // Verify `description`. - should(item.description).be.eql('Test shortcut description'); + // Verify `description`. + should(item.description).be.eql('Test shortcut description'); - // Verify `data`. - should(item.data).be.a.Object(); - }); + // Verify `data`. + should(item.data).be.a.Object(); }); }); From 7aa5290036b054bee75240488ae22f8228218906 Mon Sep 17 00:00:00 2001 From: Joshua Quick Date: Wed, 8 Jul 2020 14:24:01 -0700 Subject: [PATCH 3/3] fix(android): changing picker row color should update selected text (#11747) Co-authored-by: Gary Mathews Co-authored-by: ssekhri --- .../ui/src/java/ti/modules/titanium/ui/PickerRowProxy.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerRowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerRowProxy.java index 222e967d349..def119693aa 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerRowProxy.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerRowProxy.java @@ -41,6 +41,9 @@ public String getColor() public void setColor(String color) { setPropertyAndFire(TiC.PROPERTY_COLOR, color); + if (rowListener != null) { + rowListener.rowChanged(this); + } } @Kroll.method