javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup

Browse Source
This commit is contained in:
Nathan Walker
2025-07-19 01:18:12 -07:00
parent 2fb70c1f10
commit 248a85f6e0
15 changed files with 439 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/ui/core/view/index.android.ts
View File

@@ -1,6 +1,6 @@
import type { Point, Position } from './view-interfaces';
import type { GestureTypes, GestureEventData } from '../../gestures';
import { getNativeScriptGlobals } from '../../../globals/global-utils';
import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper } from './view-common';
import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../../styling/style-properties';
import { Length } from '../../styling/length-shared';
@@ -143,7 +143,7 @@ function initializeDialogFragment() {
};
// Fist fire application.android global event
global.NativeScriptGlobals.events.notify(args);
getNativeScriptGlobals().events.notify(args);
if (args.cancel) {
return;
}

19
packages/core/ui/styling/style-scope.ts
View File

@@ -1,3 +1,4 @@
import { getNativeScriptGlobals } from '../../globals/global-utils';
import { ViewBase } from '../core/view-base';
import { View } from '../core/view';
import { _evaluateCssVariableExpression, _evaluateCssCalcExpression, isCssVariable, isCssVariableExpression, isCssCalcExpression } from '../core/properties';
@@ -23,18 +24,8 @@ import { parse as parseCss } from '../../css/lib/parse';
// @ts-ignore apps resolve this at runtime with path alias in project bundlers
import appConfig from '~/package.json';
// if (!global.__dirname) {
// global.__dirname = typeof __dirname !== 'undefined' ? __dirname : import.meta.dirname;
// }
// const appPackagePath = path.join(global.__dirname, 'package.json');
console.log('style-scope appConfig:', appConfig);
let parser: 'rework' | 'nativescript' | 'css-tree' = 'css-tree';
try {
console.log('style-scope here??');
// @ts-ignore
// const appConfig = require('~/package.json');
// console.log('style-scope appConfig:', appConfig);
if (appConfig) {
if (appConfig.cssParser === 'rework') {
parser = 'rework';
@@ -497,8 +488,8 @@ const loadCss = profile(`"style-scope".loadCss`, (cssModule: string): void => {
}
});
global.NativeScriptGlobals.events.on('cssChanged', <any>onCssChanged);
global.NativeScriptGlobals.events.on('livesync', onLiveSync);
getNativeScriptGlobals().events.on('cssChanged', <any>onCssChanged);
getNativeScriptGlobals().events.on('livesync', onLiveSync);
// Call to this method is injected in the application in:
// - no-snapshot - code injected in app.ts by [bundle-config-loader](https://github.com/NativeScript/nativescript-dev-webpack/blob/9b1e34d8ef838006c9b575285c42d2304f5f02b5/bundle-config-loader.ts#L85-L92)
@@ -507,7 +498,7 @@ global.NativeScriptGlobals.events.on('livesync', onLiveSync);
// when the snapshot is created - there is no way to use file qualifiers or change the name of on app.css
export const loadAppCSS = profile('"style-scope".loadAppCSS', (args: LoadAppCSSEventData) => {
loadCss(args.cssFile, null, null);
global.NativeScriptGlobals.events.off('loadAppCss', loadAppCSS);
getNativeScriptGlobals().events.off('loadAppCss', loadAppCSS);
});
if (Application.hasLaunched()) {
@@ -521,7 +512,7 @@ if (Application.hasLaunched()) {
null,
);
} else {
global.NativeScriptGlobals.events.on('loadAppCss', loadAppCSS);
getNativeScriptGlobals().events.on('loadAppCss', loadAppCSS);
}
export class CssState {