diff --git a/doric-js/index.debug.ts b/doric-js/index.debug.ts index e92d6930..baac0869 100644 --- a/doric-js/index.debug.ts +++ b/doric-js/index.debug.ts @@ -16,7 +16,6 @@ import * as doric from './src/runtime/sandbox' import WebSocket from "ws" import path from 'path' -import { BridgeContext } from './src/runtime/global'; type MSG = { type: "D2C" | "C2D" | "C2S" | "D2S" | "S2C" | "S2D", @@ -197,13 +196,24 @@ global.nativeLog = (type: string, msg: string) => { } global.nativeRequire = () => { - console.error("Do not call nativeRequire here"); + console.error("In debugger,do not support call nativeRequire here", new Error().stack); return false; } global.nativeBridge = () => { - console.error("Do not call nativeBridge here"); + console.error("In debugger,do not support call nativeBridge here", new Error().stack); return false; } +global.Envrionment = new Proxy({}, { + get: (target, p, receiver) => { + console.error("In debugger,do not support get Environment's value here", new Error().stack) + return undefined + }, + set: (target, p, v, receiver) => { + console.error("In debugger,do not support set Environment's value here", new Error().stack) + return Reflect.set(target, p, v, receiver); + } +}) + export * from './index' \ No newline at end of file diff --git a/doric-js/lib/src/widget/flexScroller.d.ts b/doric-js/lib/src/widget/flexScroller.d.ts deleted file mode 100644 index 1d82674a..00000000 --- a/doric-js/lib/src/widget/flexScroller.d.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { View, IView, Group } from '../ui/view'; -import { BridgeContext } from '../runtime/global'; -export declare function flexScroller(views: View[], config?: IFlexScroller): FlexScroller; -export interface IFlexScroller extends IView { - contentOffset?: { - x: number; - y: number; - }; -} -export declare class FlexScroller extends Group implements IFlexScroller { - contentOffset?: { - x: number; - y: number; - }; - onScroll?: (offset: { - x: number; - y: number; - }) => void; - onScrollEnd?: (offset: { - x: number; - y: number; - }) => void; - scrollTo(context: BridgeContext, offset: { - x: number; - y: number; - }, animated?: boolean): Promise; - scrollBy(context: BridgeContext, offset: { - x: number; - y: number; - }, animated?: boolean): Promise; -} diff --git a/doric-js/lib/src/widget/flexScroller.js b/doric-js/lib/src/widget/flexScroller.js deleted file mode 100644 index 25222096..00000000 --- a/doric-js/lib/src/widget/flexScroller.js +++ /dev/null @@ -1,59 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -/* - * Copyright [2019] [Doric.Pub] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { Property, Group } from '../ui/view'; -import { layoutConfig } from '../util/layoutconfig'; -export function flexScroller(views, config) { - const ret = new FlexScroller; - ret.layoutConfig = layoutConfig().fit(); - for (let v of views) { - ret.addChild(v); - } - if (config) { - for (let key in config) { - Reflect.set(ret, key, Reflect.get(config, key, config), ret); - } - } - return ret; -} -export class FlexScroller extends Group { - scrollTo(context, offset, animated) { - return this.nativeChannel(context, "scrollTo")({ offset, animated }); - } - scrollBy(context, offset, animated) { - return this.nativeChannel(context, "scrollBy")({ offset, animated }); - } -} -__decorate([ - Property, - __metadata("design:type", Object) -], FlexScroller.prototype, "contentOffset", void 0); -__decorate([ - Property, - __metadata("design:type", Function) -], FlexScroller.prototype, "onScroll", void 0); -__decorate([ - Property, - __metadata("design:type", Function) -], FlexScroller.prototype, "onScrollEnd", void 0); diff --git a/doric-js/lib/src/widget/flexlayout.d.ts b/doric-js/lib/src/widget/flexlayout.d.ts deleted file mode 100644 index 0b06133e..00000000 --- a/doric-js/lib/src/widget/flexlayout.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { IView, Group } from "../ui/view"; -import { Modeling } from "../util/types"; -declare enum ValueType { - Point = 0, - Percent = 1, - Auto = 2 -} -export declare class FlexValue implements Modeling { - type: ValueType; - value: number; - static Auto: FlexValue; - static percent(v: number): FlexValue; - static point(v: number): FlexValue; - toModel(): { - type: ValueType; - value: number; - }; -} -export interface IFlex extends IView { -} -export declare class FlexLayout extends Group implements IFlex { -} -export {}; diff --git a/doric-js/lib/src/widget/flexlayout.js b/doric-js/lib/src/widget/flexlayout.js deleted file mode 100644 index 7244a879..00000000 --- a/doric-js/lib/src/widget/flexlayout.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright [2019] [Doric.Pub] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { Group } from "../ui/view"; -var ValueType; -(function (ValueType) { - ValueType[ValueType["Point"] = 0] = "Point"; - ValueType[ValueType["Percent"] = 1] = "Percent"; - ValueType[ValueType["Auto"] = 2] = "Auto"; -})(ValueType || (ValueType = {})); -export class FlexValue { - constructor() { - this.type = ValueType.Auto; - this.value = 0; - } - static percent(v) { - const ret = new FlexValue; - ret.type = ValueType.Percent; - ret.value = v; - return ret; - } - static point(v) { - const ret = new FlexValue; - ret.type = ValueType.Point; - ret.value = v; - return ret; - } - toModel() { - return { - type: this.type, - value: this.value, - }; - } -} -FlexValue.Auto = new FlexValue; -export class FlexLayout extends Group { -}