@compass-framework/core 1.2.59 → 1.2.61

package/@types/{ViewGroup.d.ts → view/ViewGroup.d.ts}

@@ -1,10 +1,10 @@
 import { Implements } from "@compass-framework/library";
 import { View } from "./View";
-import { AttributeSet } from "./AttributeSet";
-import { Configuration } from "./Configuration";
+import { AttributeSet } from "../content/AttributeSet";
+import { Configuration } from "../content/Configuration";
 import { ViewParent } from "./ViewParent";
-import { MotionEvent } from "./MotionEvent";
-import { DisplayMetrics } from "./DisplayMetrics";
+import { MotionEvent } from "../event/MotionEvent";
+import { DisplayMetrics } from "../content/DisplayMetrics";
 
 /**
  * 视图组，可容纳并管理子视图的测量、布局与触摸分发。

package/@types/{ViewGroupOverlay.d.ts → view/ViewGroupOverlay.d.ts}

@@ -1,5 +1,5 @@
 import { ViewOverlay } from "./ViewOverlay";
-import { Drawable } from "./Drawable";
+import { Drawable } from "../drawable/Drawable";
 import { View } from "./View";
 
 /**

package/@types/{ViewOverlay.d.ts → view/ViewOverlay.d.ts}

@@ -1,4 +1,4 @@
-import { Drawable } from "./Drawable";
+import { Drawable } from "../drawable/Drawable";
 import { ViewGroup } from "./ViewGroup";
 
 /**

package/@types/{ViewSlot.d.ts → view/ViewSlot.d.ts}

@@ -1,6 +1,6 @@
 import { Implements } from "@compass-framework/library";
-import { FrameLayout } from "./FrameLayout";
-import { Slot } from "./Slot";
+import { FrameLayout } from "../layout/FrameLayout";
+import { Slot } from "../widget/Slot";
 import { View } from "./View";
 
 /**

package/@types/{ViewTreeObserver.d.ts → view/ViewTreeObserver.d.ts}

@@ -1,6 +1,6 @@
 import { InterfaceTemplate } from "@compass-framework/library";
 import { View } from "./View";
-import { MotionEvent } from "./MotionEvent";
+import { MotionEvent } from "../event/MotionEvent";
 
 /**
  * 视图树观察者，监听全局布局、绘制前与焦点/触摸变化。

package/@types/{Adapter.d.ts → widget/Adapter.d.ts}

@@ -1,6 +1,6 @@
 import { InterfaceTemplate } from "@compass-framework/library";
-import { View } from "./View";
-import { ViewGroup } from "./ViewGroup";
+import { View } from "../view/View";
+import { ViewGroup } from "../view/ViewGroup";
 
 /**
  * 适配器接口，为列表类控件提供数据与视图绑定。

package/@types/widget/DecorView.ts

@@ -0,0 +1,5 @@
+import { FrameLayout } from "../layout/FrameLayout";
+
+export interface DecorView extends FrameLayout {
+
+}

package/@types/{EditRichText.d.ts → widget/EditRichText.d.ts}

@@ -1,7 +1,7 @@
-import { FrameLayout } from "./FrameLayout";
-import { Context } from "./Context";
-import { AttributeSet } from "./AttributeSet";
-import { View } from "./View";
+import { FrameLayout } from "../layout/FrameLayout";
+import { Context } from "../content/Context";
+import { AttributeSet } from "../content/AttributeSet";
+import { View } from "../view/View";
 
 /**
  * 富文本编辑器，支持 HTML 互转与选区样式操作。

package/@types/{EditText.d.ts → widget/EditText.d.ts}

@@ -1,5 +1,5 @@
 import { TextView } from "./TextView";
-import { Editable } from "./Editable";
+import { Editable } from "../text/Editable";
 
 /**
  * 可编辑文本框，支持输入、选区与只读控制。

package/@types/{FreezeLayoutViewGroup.d.ts → widget/FreezeLayoutViewGroup.d.ts}

@@ -1,4 +1,4 @@
-import { ViewGroup } from "./ViewGroup";
+import { ViewGroup } from "../view/ViewGroup";
 
 /**
  * 支持顶部/左侧区域冻结与独立滚动的视图组基类。

package/@types/{GridView.d.ts → widget/GridView.d.ts}

@@ -1,4 +1,4 @@
-import { ViewGroup } from "./ViewGroup";
+import { ViewGroup } from "../view/ViewGroup";
 import { ListAdapter } from "./ListAdapter";
 
 /**

package/@types/{HorizontalScrollView.ts → widget/HorizontalScrollView.ts}

@@ -1,4 +1,4 @@
-import { FrameLayout } from "./FrameLayout";
+import { FrameLayout } from "../layout/FrameLayout";
 
 /**
  * 水平滚动视图，可横向滚动显示超出范围的内容。

package/@types/{Image.d.ts → widget/Image.d.ts}

@@ -1,5 +1,5 @@
 import { InterfaceTemplate } from "@compass-framework/library";
-import { Context } from "./Context";
+import { Context } from "../content/Context";
 
 /**
  * 位图图像，封装像素缓冲及其尺寸。

package/@types/{ImageView.d.ts → widget/ImageView.d.ts}

@@ -5,7 +5,7 @@ import {
 
 import {
   View,
-} from "./View";
+} from "../view/View";
 
 /**
  * 图片视图，用于展示图像内容。

package/@types/{ListView.d.ts → widget/ListView.d.ts}

@@ -1,5 +1,5 @@
 import { ListAdapter } from "./ListAdapter";
-import { ViewGroup } from "./ViewGroup";
+import { ViewGroup } from "../view/ViewGroup";
 
 /**
  * 列表视图，通过适配器展示可滚动的条目列表。

package/@types/{ScrollView.d.ts → widget/ScrollView.d.ts}

@@ -1,6 +1,6 @@
 import {
   FrameLayout,
-} from "./FrameLayout";
+} from "../layout/FrameLayout";
 
 /**
  * 垂直滚动视图，可滚动显示超出范围的内容。

package/@types/{Slot.d.ts → widget/Slot.d.ts}

@@ -1,5 +1,5 @@
 import { InterfaceTemplate } from "@compass-framework/library";
-import { View } from "./View";
+import { View } from "../view/View";
 
 /**
  * 插槽接口，用于替换目标视图内容。

package/@types/{TextView.d.ts → widget/TextView.d.ts}

@@ -1,5 +1,5 @@
 import { CharSequence } from "@compass-framework/library";
-import { View } from "./View";
+import { View } from "../view/View";
 
 /**
  * 文本视图，负责显示与样式化文本内容。

package/@types/window/ApplicationWindow.ts

@@ -0,0 +1,12 @@
+import { Context } from "../content/Context";
+import { View } from "../view/View";
+import { DecorView } from "../widget/DecorView";
+import { Window } from "./Window";
+
+export declare class ApplicationWindow extends Window {
+  public getCurrentFocus(): View;
+
+  public getContext(): Context;
+
+  public getDecorView(): DecorView;
+}

package/@types/window/PopupWindow.d.ts

@@ -0,0 +1,41 @@
+import { WindowManager } from "./WindowManager";
+import { View } from "../view/View";
+import { Context } from "../content/Context";
+import { DecorView } from "../widget/DecorView";
+
+/**
+ * 弹出窗口，在指定位置展示浮动内容视图。
+ */
+export declare class PopupWindow {
+  public constructor();
+
+  public showAtLocation(parent: View, gravity: number, x: number, y: number): void;
+
+  public isShowing() : boolean;
+
+  public isOutsideTouchable():boolean;
+
+  public dismiss(): void;
+
+  public update(x: number, y: number, width: number, height: number): void;
+
+  public getDecorView(): DecorView;
+
+  public getContentView(): View;
+
+  public getOnGenericMotionListener(): View.OnGenericMotionListener;
+
+  public getOnTouchListener(): View.OnTouchListener;
+
+  public getContext(): Context;
+
+  public getLayoutParams(): WindowManager.LayoutParams;
+
+  public setOnTouchListener(l: View.OnTouchListener): void;
+
+  public setContentView(contentView: View): void;
+
+  public setOutsideTouchable(touchable: boolean):void;
+
+  public setOnGenericMotionListener(l: View.OnGenericMotionListener): void;
+}

package/@types/window/Window.d.ts

@@ -0,0 +1,24 @@
+import { ArrayList } from "@compass-framework/library";
+import { View } from "../view/View";
+import { DecorView } from "../widget/DecorView";
+import { Context } from "../content/Context";
+import { WindowManager } from "./WindowManager";
+
+export declare abstract class Window {
+  public findViewById(id: number): View;
+  public findViewById(id: string): View;
+
+  public findViewByTag(tag: string): View;
+
+  public findViewsByTag(tag: string): ArrayList<View>;
+
+  public abstract getCurrentFocus(): View;
+
+  public abstract getContext(): Context;
+
+  public abstract getDecorView(): DecorView;
+
+  public getAttributes(): WindowManager.LayoutParams;
+
+  public setAttributes(a: WindowManager.LayoutParams): void;
+}

package/@types/{WindowManager.d.ts → window/WindowManager.d.ts}

@@ -1,16 +1,18 @@
-import { ViewGroup } from "./ViewGroup";
+import { ViewGroup } from "../view/ViewGroup";
+import { View } from "../view/View";
 
 /**
  * 窗口管理器，负责添加、移除与更新窗口布局。
  */
 export declare class WindowManager {
-  public addWindow(window: Window): void;
-  public addWindow(window: Window, params: WindowManager.LayoutParams): void;
+  public addView(view: View): void;
+  public addView(view: View, params: WindowManager.LayoutParams): void;
+  public addView(view: View, params: WindowManager.LayoutParams, nest: boolean): void;
 
-  public removeWindow(window: Window): void;
+  public removeView(view: View): void;
 
-  public updateWindowLayout(window: Window): void;
-  public updateWindowLayout(window: Window, params: WindowManager.LayoutParams): void;
+  public updateViewLayout(view: View): void;
+  public updateViewLayout(view: View, params: WindowManager.LayoutParams): void;
 }
 
 /**

package/index.d.ts

@@ -1,111 +1,118 @@
-export * from "./@types/AbsoluteLayout";
-export * from "./@types/AccelerateDecelerateInterpolator";
-export * from "./@types/AccelerateInterpolator";
-export * from "./@types/Adapter";
-export * from "./@types/AlphaAnimation";
-export * from "./@types/Animation";
-export * from "./@types/AnimationSet";
-export * from "./@types/Animator";
-export * from "./@types/Application";
-export * from "./@types/ApplicationWindow";
-export * from "./@types/ArrayAdapter";
-export * from "./@types/Assets";
-export * from "./@types/AttributeSet";
-export * from "./@types/BaseAdapter";
-export * from "./@types/BlendMode";
-export * from "./@types/BounceInterpolator";
-export * from "./@types/Button";
-export * from "./@types/Canvas";
-export * from "./@types/Color";
-export * from "./@types/ColorDrawable";
-export * from "./@types/ColorFilter";
-export * from "./@types/Configuration";
-export * from "./@types/Context";
-export * from "./@types/ContextUtils";
-export * from "./@types/CornerPathEffect";
-export * from "./@types/CornersDrawable";
-export * from "./@types/CycleInterpolator";
-export * from "./@types/DecelerateInterpolator";
-export * from "./@types/DisplayMetrics";
-export * from "./@types/DoubleClick";
-export * from "./@types/DoubleClickListener";
-export * from "./@types/Drawable";
-export * from "./@types/Editable";
-export * from "./@types/EditRichText";
-export * from "./@types/EditText";
-export * from "./@types/Environment";
-export * from "./@types/FrameLayout";
-export * from "./@types/FreezeAbsoluteLayout";
-export * from "./@types/FreezeLayoutViewGroup";
-export * from "./@types/Gravity";
-export * from "./@types/GridLayout";
-export * from "./@types/GridLayoutAnimationController";
-export * from "./@types/GridView";
-export * from "./@types/HorizontalScrollView";
-export * from "./@types/Image";
-export * from "./@types/ImageDrawable";
-export * from "./@types/ImageFilter";
-export * from "./@types/ImageView";
-export * from "./@types/InputMethodService";
-export * from "./@types/Interpolator";
-export * from "./@types/KeyEvent";
-export * from "./@types/LayerDrawable";
-export * from "./@types/LayoutAnimationController";
-export * from "./@types/LayoutInflater";
-export * from "./@types/LinearGradient";
-export * from "./@types/LinearGradientDrawable";
-export * from "./@types/LinearInterpolator";
-export * from "./@types/LinearLayout";
-export * from "./@types/ListAdapter";
-export * from "./@types/ListView";
-export * from "./@types/Matrix";
-export * from "./@types/MotionEvent";
-export * from "./@types/MouseCursor";
-export * from "./@types/Outline";
-export * from "./@types/Paint";
-export * from "./@types/Path";
-export * from "./@types/PathEffect";
-export * from "./@types/Picture";
-export * from "./@types/PictureDrawable";
-export * from "./@types/PixelFormat";
-export * from "./@types/PopupWindow";
-export * from "./@types/PropertyValuesHolder";
-export * from "./@types/Rect";
-export * from "./@types/RelativeLayout";
-export * from "./@types/RendererBackend";
-export * from "./@types/Resolver";
-export * from "./@types/Resources";
-export * from "./@types/ResourcesInflater";
-export * from "./@types/RotateAnimation";
-export * from "./@types/ScaleAnimation";
-export * from "./@types/ScrollView";
-export * from "./@types/Shader";
-export * from "./@types/Shadow";
-export * from "./@types/Slot";
-export * from "./@types/Surface";
-export * from "./@types/SurfaceProvider";
-export * from "./@types/TabBarLayout";
-export * from "./@types/TableLayout";
-export * from "./@types/TableRow";
-export * from "./@types/TextView";
-export * from "./@types/Theme";
-export * from "./@types/TimeInterpolator";
-export * from "./@types/Transformation";
-export * from "./@types/TranslateAnimation";
-export * from "./@types/TypeEvaluator";
-export * from "./@types/Typeface";
-export * from "./@types/TypefaceFactory";
-export * from "./@types/ValueAnimator";
-export * from "./@types/View";
-export * from "./@types/ViewGroup";
-export * from "./@types/ViewGroupOverlay";
-export * from "./@types/ViewOutlineProvider";
-export * from "./@types/ViewOverlay";
-export * from "./@types/ViewParent";
-export * from "./@types/ViewSlot";
-export * from "./@types/ViewTreeObserver";
-export * from "./@types/Window";
-export * from "./@types/WindowManager";
-export * from "./@types/XMLLayoutParser";
-export * from "./@types/XMLResourcesParser";
-export * from "./@types/XMLViewFactoryRegistry";
+export * from "./@types/widget/Adapter";
+export * from "./@types/content/BaseAdapter";
+export * from "./@types/content/ArrayAdapter";
+export * from "./@types/widget/Button";
+export * from "./@types/widget/EditRichText";
+export * from "./@types/widget/EditText";
+export * from "./@types/widget/FreezeAbsoluteLayout";
+export * from "./@types/widget/FreezeLayoutViewGroup";
+export * from "./@types/widget/GridView";
+export * from "./@types/widget/HorizontalScrollView";
+export * from "./@types/widget/Image";
+export * from "./@types/widget/ImageView";
+
+export * from "./@types/misc/DoubleClick";
+export * from "./@types/misc/DoubleClickListener";
+
+export * from "./@types/app/Application";
+export * from "./@types/text/Editable";
+export * from "./@types/shared/ContextUtils";
+
+export * from "./@types/layout/FrameLayout";
+export * from "./@types/layout/GridLayout";
+export * from "./@types/layout/AbsoluteLayout";
+export * from "./@types/layout/LinearLayout";
+export * from "./@types/layout/RelativeLayout";
+export * from "./@types/layout/GridLayoutAnimationController";
+
+export * from "./@types/drawable/CornersDrawable";
+export * from "./@types/drawable/Drawable";
+export * from "./@types/drawable/ImageDrawable";
+export * from "./@types/drawable/LayerDrawable";
+export * from "./@types/drawable/LinearGradientDrawable";
+export * from "./@types/drawable/PictureDrawable";
+export * from "./@types/drawable/ColorDrawable";
+
+export * from "./@types/content/AttributeSet";
+export * from "./@types/content/Configuration";
+export * from "./@types/content/Context";
+export * from "./@types/content/DisplayMetrics";
+export * from "./@types/evaluate/Environment";
+export * from "./@types/content/LayoutInflater";
+export * from "./@types/content/PixelFormat";
+export * from "./@types/evaluate/Resolver";
+export * from "./@types/content/Resources";
+
+export * from "./@types/canvas/BlendMode";
+export * from "./@types/canvas/Canvas";
+export * from "./@types/canvas/Color";
+export * from "./@types/canvas/ColorFilter";
+export * from "./@types/canvas/CornerPathEffect";
+export * from "./@types/canvas/ImageFilter";
+export * from "./@types/canvas/LinearGradient";
+export * from "./@types/canvas/Paint";
+export * from "./@types/canvas/Path";
+export * from "./@types/canvas/Rect";
+export * from "./@types/canvas/Matrix";
+export * from "./@types/canvas/RendererBackend";
+export * from "./@types/canvas/PathEffect";
+export * from "./@types/canvas/Picture";
+export * from "./@types/canvas/Shader";
+export * from "./@types/canvas/Shadow";
+export * from "./@types/canvas/Surface";
+export * from "./@types/canvas/Typeface";
+export * from "./@types/canvas/TypefaceFactory";
+
+export * from "./@types/animation/AccelerateDecelerateInterpolator";
+export * from "./@types/animation/AccelerateInterpolator";
+export * from "./@types/animation/AlphaAnimation";
+export * from "./@types/animation/Animation";
+export * from "./@types/animation/AnimationSet";
+export * from "./@types/animation/BounceInterpolator";
+export * from "./@types/animation/CycleInterpolator";
+export * from "./@types/animation/DecelerateInterpolator";
+
+export * from "./@types/widget/Slot";
+export * from "./@types/widget/TextView";
+export * from "./@types/widget/ListAdapter";
+export * from "./@types/widget/ListView";
+export * from "./@types/widget/ScrollView";
+
+export * from "./@types/display/SurfaceProvider";
+export * from "./@types/layout/TableLayout";
+export * from "./@types/layout/TableRow";
+export * from "./@types/content/Theme";
+export * from "./@types/layout/TabBarLayout";
+
+export * from "./@types/animation/RotateAnimation";
+export * from "./@types/animation/ScaleAnimation";
+export * from "./@types/animation/Transformation";
+export * from "./@types/animation/TranslateAnimation";
+
+export * from "./@types/animator/TimeInterpolator";
+export * from "./@types/animator/TypeEvaluator";
+export * from "./@types/animator/ValueAnimator";
+export * from "./@types/animator/Animator";
+export * from "./@types/animator/PropertyValuesHolder";
+
+export * from "./@types/view/Gravity";
+export * from "./@types/view/Outline";
+export * from "./@types/view/View";
+export * from "./@types/view/ViewGroup";
+export * from "./@types/view/ViewGroupOverlay";
+export * from "./@types/view/ViewOutlineProvider";
+export * from "./@types/view/ViewOverlay";
+export * from "./@types/view/ViewParent";
+export * from "./@types/view/ViewSlot";
+export * from "./@types/view/ViewTreeObserver";
+
+export * from "./@types/animation/Interpolator";
+export * from "./@types/event/KeyEvent";
+export * from "./@types/animation/LayoutAnimationController";
+export * from "./@types/animation/LinearInterpolator";
+export * from "./@types/event/MotionEvent";
+export * from "./@types/display/MouseCursor";
+
+export * from "./@types/window/Window";
+export * from "./@types/window/PopupWindow";
+export * from "./@types/window/WindowManager";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@compass-framework/core",
-	"version": "1.2.59",
+	"version": "1.2.61",
 	"description": "@compass-framework/core public api",
 	"types": "./index.d.ts",
 	"main": "./index.js",

package/@types/Application.d.ts

@@ -1,58 +0,0 @@
-import { Consumer } from "@compass-framework/library";
-import { Context } from "./Context";
-import { RendererBackend } from "./RendererBackend";
-import { Window } from "./Window";
-import { InputMethodService } from "./InputMethodService";
-
-/**
- * Web 端应用启动配置。
- */
-export interface WebApplicationConfig {
-  ime?: () => InputMethodService
-  container?: string | HTMLElement
-}
-
-/**
- * CanvasKit 渲染后端的应用启动配置。
- */
-export interface CanvaskitApplicationConfig extends WebApplicationConfig {
-
-}
-
-/**
- * Node 端应用启动配置。
- */
-export interface NodeApplicationConfig {
-  width: number;
-  height: number;
-}
-
-/**
- * 应用程序入口与生命周期管理。
- */
-export declare interface Application {
-  onReady(consumer: Consumer<Context>): void;
-
-  addWindow(window: Window): void;
-
-  removeWindow(window: Window): void;
-}
-
-/**
- * Application 工厂与配置映射。
- */
-export namespace Application {
-  /**
-   * 按渲染后端区分的应用配置映射。
-   */
-  export interface ApplicationConfig {
-    [RendererBackend.CanvasKit]: CanvaskitApplicationConfig,
-    [RendererBackend.Web]: WebApplicationConfig,
-    [RendererBackend.Node]: NodeApplicationConfig,
-  }
-
-  /**
-   * 按渲染后端创建应用实例。
-   */
-  export function create<T extends keyof ApplicationConfig>(render: RendererBackend, config: ApplicationConfig[T]): Application;
-}

package/@types/ApplicationWindow.d.ts

@@ -1,47 +0,0 @@
-import { ArrayList, Implements, XML } from "@compass-framework/library";
-import { Resources } from "./Resources";
-import { View } from "./View";
-import { WindowContext } from "./WindowContext";
-import { WindowManager } from "./WindowManager";
-import { ViewGroup } from "./ViewGroup";
-import { Context } from "./Context";
-import { Window } from "./Window";
-import { Configuration } from "./Configuration";
-
-/**
- * 应用程序主窗口，承载内容视图与窗口生命周期。
- */
-@Implements(Window)
-export declare class ApplicationWindow implements Window {
-  public constructor();
-  public constructor(context: WindowContext);
-
-  public findViewById(id: number): View;
-  public findViewById(id: string): View;
-
-  public findViewByTag(tag: string): View;
-
-  public findViewsByTag(tag: string): ArrayList<View>;
-
-  public onCreate(): void;
-
-  public onResume(): void;
-
-  public onDestroy(): void;
-
-  public onConfigurationChanged(configuration: Configuration): void;
-
-  public getDecorView(): ViewGroup;
-
-  public getContentView(): View;
-
-  public getLayoutParams(): WindowManager.LayoutParams;
-
-  public getResources(): Resources;
-
-  public getContext(): Context;
-
-  public setContentXML(xml: XML): void;
-
-  public setContentView(view: View): void;
-}

package/@types/Assets.d.ts

@@ -1,6 +0,0 @@
-/**
- * 资源资产访问，按名称解析资产 ID。
- */
-export declare class Assets {
-  public getAssetsId(name: string, defaultValue?: number): number;
-}