Skip to content

Commit ed96746

Browse files
rigor789rigor789
committed
feat: add <android> and <ios> elements
1 parent 8a8446f commit ed96746

File tree

15 files changed

+202
-4287
lines changed

15 files changed

+202
-4287
lines changed

‎__tests__/renderer/utils.test.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import * as utils from 'renderer/utils'
22

3-
jest.mock('ui/core/view', () => {
3+
jest.mock('tns-core-modules/ui/core/view', () => {
44
return {
55
View() {
66
}
77
}
88
}, {virtual: true})
9-
jest.mock('ui/content-view', () => {
9+
jest.mock('tns-core-modules/ui/content-view', () => {
1010
return {
1111
ContentView() {
1212
}
1313
}
1414
}, {virtual: true})
15-
jest.mock('ui/layouts/layout-base', () => {
15+
jest.mock('tns-core-modules/ui/layouts/layout-base', () => {
1616
return {
1717
LayoutBase() {
1818
}
@@ -34,7 +34,7 @@ const getParentAndChild = (parentType) => {
3434

3535
describe('utils', () => {
3636
test('isView', () => {
37-
const View = require('ui/core/view').View;
37+
const View = require('tns-core-modules/ui/core/view').View;
3838

3939
expect(utils.isView()).toEqual(false)
4040
expect(utils.isView('a')).toEqual(false)
@@ -43,7 +43,7 @@ describe('utils', () => {
4343
})
4444

4545
test('isLayout', () => {
46-
const LayoutBase = require('ui/layouts/layout-base').LayoutBase;
46+
const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
4747

4848
expect(utils.isLayout()).toEqual(false)
4949
expect(utils.isLayout('a')).toEqual(false)
@@ -52,7 +52,7 @@ describe('utils', () => {
5252
})
5353

5454
test('isContentView', () => {
55-
const ContentView = require('ui/content-view').ContentView;
55+
const ContentView = require('tns-core-modules/ui/content-view').ContentView;
5656

5757
expect(utils.isContentView()).toEqual(false)
5858
expect(utils.isContentView('a')).toEqual(false)
@@ -73,7 +73,7 @@ describe('utils', () => {
7373

7474

7575
test('insertChild adds childNode to Layout parent', () => {
76-
const LayoutBase = require('ui/layouts/layout-base').LayoutBase;
76+
const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
7777
const {parentNode, childNode} = getParentAndChild(LayoutBase);
7878
parentNode.nativeView.addChild = jest.fn();
7979
childNode.nativeView.parent = null;
@@ -84,7 +84,7 @@ describe('utils', () => {
8484

8585

8686
test('insertChild adds childNode at index to Layout parent', () => {
87-
const LayoutBase = require('ui/layouts/layout-base').LayoutBase;
87+
const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
8888
const {parentNode, childNode} = getParentAndChild(LayoutBase);
8989
parentNode.nativeView.insertChild = jest.fn();
9090
childNode.nativeView.parent = null;
@@ -94,7 +94,7 @@ describe('utils', () => {
9494
})
9595

9696
test('insertChild removes childNode if the parent is the same Layout parent', () => {
97-
const LayoutBase = require('ui/layouts/layout-base').LayoutBase;
97+
const LayoutBase = require('tns-core-modules/ui/layouts/layout-base').LayoutBase;
9898
const {parentNode, childNode} = getParentAndChild(LayoutBase);
9999
parentNode.nativeView.getChildIndex = jest.fn().mockReturnValueOnce(1).mockReturnValueOnce(-1);
100100
parentNode.nativeView.removeChild = jest.fn();
@@ -112,7 +112,7 @@ describe('utils', () => {
112112
})
113113

114114
test('insertChild adds comment node to ContentView parent', () => {
115-
const ContentView = require('ui/content-view').ContentView;
115+
const ContentView = require('tns-core-modules/ui/content-view').ContentView;
116116
const {parentNode, childNode} = getParentAndChild(ContentView);
117117
childNode.nodeType = 8;
118118
parentNode.nativeView._addView = jest.fn();
@@ -122,7 +122,7 @@ describe('utils', () => {
122122
})
123123

124124
test('insertChild sets content of ContentView parent', () => {
125-
const ContentView = require('ui/content-view').ContentView;
125+
const ContentView = require('tns-core-modules/ui/content-view').ContentView;
126126
const {parentNode, childNode} = getParentAndChild(ContentView);
127127

128128
utils.insertChild(parentNode, childNode);

‎build/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const builds = {
3838
moduleName: 'NativeScript-Vue',
3939
banner: banner('NativeScript-Vue'),
4040
external(id) {
41-
return id.startsWith('ui/') || id.startsWith('application')
41+
return id.startsWith('tns-core-modules') || id.startsWith('weex')
4242
}
4343
},
4444
'nativescript-vue-template-compiler': {

0 commit comments

Comments
 (0)