add flexscroller

doric-js/bundle/doric-lib.es5.js

@@ -2629,6 +2629,89 @@ function switchView(config) {
     return ret;
 }
 
+var __extends$e = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) { if (b.hasOwnProperty(p)) { d[p] = b[p]; } } };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate$e = (undefined && undefined.__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$e = (undefined && undefined.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") { return Reflect.metadata(k, v); }
+};
+var __values$4 = (undefined && undefined.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) { return m.call(o); }
+    if (o && typeof o.length === "number") { return {
+        next: function () {
+            if (o && i >= o.length) { o = void 0; }
+            return { value: o && o[i++], done: !o };
+        }
+    }; }
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+function flexScroller(views, config) {
+    var e_1, _a;
+    var ret = new FlexScroller;
+    ret.layoutConfig = layoutConfig().fit();
+    try {
+        for (var views_1 = __values$4(views), views_1_1 = views_1.next(); !views_1_1.done; views_1_1 = views_1.next()) {
+            var v = views_1_1.value;
+            ret.addChild(v);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (views_1_1 && !views_1_1.done && (_a = views_1.return)) { _a.call(views_1); }
+        }
+        finally { if (e_1) { throw e_1.error; } }
+    }
+    if (config) {
+        for (var key in config) {
+            Reflect.set(ret, key, Reflect.get(config, key, config), ret);
+        }
+    }
+    return ret;
+}
+var FlexScroller = /** @class */ (function (_super) {
+    __extends$e(FlexScroller, _super);
+    function FlexScroller() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    FlexScroller.prototype.scrollTo = function (context, offset, animated) {
+        return this.nativeChannel(context, "scrollTo")({ offset: offset, animated: animated });
+    };
+    FlexScroller.prototype.scrollBy = function (context, offset, animated) {
+        return this.nativeChannel(context, "scrollBy")({ offset: offset, animated: animated });
+    };
+    __decorate$e([
+        Property,
+        __metadata$e("design:type", Object)
+    ], FlexScroller.prototype, "contentOffset", void 0);
+    __decorate$e([
+        Property,
+        __metadata$e("design:type", Function)
+    ], FlexScroller.prototype, "onScroll", void 0);
+    __decorate$e([
+        Property,
+        __metadata$e("design:type", Function)
+    ], FlexScroller.prototype, "onScrollEnd", void 0);
+    return FlexScroller;
+}(Group));
+
 function modal(context) {
     return {
         toast: function (msg, gravity) {
@@ -2925,7 +3008,7 @@ var __generator = (undefined && undefined.__generator) || function (thisArg, bod
         if (op[0] & 5) { throw op[1]; } return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __values$4 = (undefined && undefined.__values) || function(o) {
+var __values$5 = (undefined && undefined.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) { return m.call(o); }
     if (o && typeof o.length === "number") { return {
@@ -2962,10 +3045,10 @@ function animate(context) {
                                     return ret;
                                 }
                                 try {
-                                    for (var _c = __values$4(panel_1.allHeadViews()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                    for (var _c = __values$5(panel_1.allHeadViews()), _d = _c.next(); !_d.done; _d = _c.next()) {
                                         var map = _d.value;
                                         try {
-                                            for (var _e = (e_2 = void 0, __values$4(map.values())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                            for (var _e = (e_2 = void 0, __values$5(map.values())), _f = _e.next(); !_f.done; _f = _e.next()) {
                                                 var v = _f.value;
                                                 if (v.isDirty()) {
                                                     var model_1 = v.toModel();
@@ -3081,7 +3164,7 @@ function notch(context) {
     };
 }
 
-var __values$5 = (undefined && undefined.__values) || function(o) {
+var __values$6 = (undefined && undefined.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) { return m.call(o); }
     if (o && typeof o.length === "number") { return {
@@ -3112,7 +3195,7 @@ var Observable = /** @class */ (function () {
             this.provider.provide(newV);
         }
         try {
-            for (var _b = __values$5(this.observers), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values$6(this.observers), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var observer = _c.value;
                 observer(newV);
             }
@@ -3156,7 +3239,7 @@ var Provider = /** @class */ (function () {
     return Provider;
 }());
 
-var __extends$e = (undefined && undefined.__extends) || (function () {
+var __extends$f = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -3197,7 +3280,7 @@ var ViewModel = /** @class */ (function () {
     return ViewModel;
 }());
 var VMPanel = /** @class */ (function (_super) {
-    __extends$e(VMPanel, _super);
+    __extends$f(VMPanel, _super);
     function VMPanel() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
@@ -3220,6 +3303,7 @@ exports.CENTER_Y = CENTER_Y;
 exports.Color = Color;
 exports.Draggable = Draggable;
 exports.FlexLayout = FlexLayout;
+exports.FlexScroller = FlexScroller;
 exports.FlowLayout = FlowLayout;
 exports.FlowLayoutItem = FlowLayoutItem;
 exports.Gravity = Gravity;
@@ -3260,6 +3344,7 @@ exports.ViewModel = ViewModel;
 exports.animate = animate;
 exports.coordinator = coordinator;
 exports.draggable = draggable;
+exports.flexScroller = flexScroller;
 exports.flexlayout = flexlayout;
 exports.flowItem = flowItem;
 exports.flowlayout = flowlayout;

doric-js/bundle/doric-lib.js

@@ -1956,6 +1956,49 @@ function switchView(config) {
     return ret;
 }
 
+var __decorate$e = (undefined && undefined.__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$e = (undefined && undefined.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+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;
+}
+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$e([
+    Property,
+    __metadata$e("design:type", Object)
+], FlexScroller.prototype, "contentOffset", void 0);
+__decorate$e([
+    Property,
+    __metadata$e("design:type", Function)
+], FlexScroller.prototype, "onScroll", void 0);
+__decorate$e([
+    Property,
+    __metadata$e("design:type", Function)
+], FlexScroller.prototype, "onScrollEnd", void 0);
+
 function modal(context) {
     return {
         toast: (msg, gravity = Gravity.Bottom) => {
@@ -2432,6 +2475,7 @@ exports.CENTER_Y = CENTER_Y;
 exports.Color = Color;
 exports.Draggable = Draggable;
 exports.FlexLayout = FlexLayout;
+exports.FlexScroller = FlexScroller;
 exports.FlowLayout = FlowLayout;
 exports.FlowLayoutItem = FlowLayoutItem;
 exports.Gravity = Gravity;
@@ -2472,6 +2516,7 @@ exports.ViewModel = ViewModel;
 exports.animate = animate;
 exports.coordinator = coordinator;
 exports.draggable = draggable;
+exports.flexScroller = flexScroller;
 exports.flexlayout = flexlayout;
 exports.flowItem = flowItem;
 exports.flowlayout = flowlayout;

doric-js/bundle/doric-vm.js

@@ -3415,6 +3415,49 @@ function switchView(config) {
     return ret;
 }
 
+var __decorate$e = (undefined && undefined.__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$e = (undefined && undefined.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+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;
+}
+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$e([
+    Property,
+    __metadata$e("design:type", Object)
+], FlexScroller.prototype, "contentOffset", void 0);
+__decorate$e([
+    Property,
+    __metadata$e("design:type", Function)
+], FlexScroller.prototype, "onScroll", void 0);
+__decorate$e([
+    Property,
+    __metadata$e("design:type", Function)
+], FlexScroller.prototype, "onScrollEnd", void 0);
+
 function modal(context) {
     return {
         toast: (msg, gravity = Gravity.Bottom) => {
@@ -4026,6 +4069,7 @@ exports.CENTER_Y = CENTER_Y;
 exports.Color = Color;
 exports.Draggable = Draggable;
 exports.FlexLayout = FlexLayout;
+exports.FlexScroller = FlexScroller;
 exports.FlowLayout = FlowLayout;
 exports.FlowLayoutItem = FlowLayoutItem;
 exports.Gravity = Gravity;
@@ -4066,6 +4110,7 @@ exports.ViewModel = ViewModel;
 exports.animate = animate;
 exports.coordinator = coordinator;
 exports.draggable = draggable;
+exports.flexScroller = flexScroller;
 exports.flexlayout = flexlayout;
 exports.flowItem = flowItem;
 exports.flowlayout = flowlayout;

doric-js/index.d.ts

@@ -88,6 +88,7 @@ declare module 'doric/lib/src/widget/index.widget' {
     export * from 'doric/lib/src/widget/nestedSlider';
     export * from 'doric/lib/src/widget/draggable';
     export * from 'doric/lib/src/widget/switch';
+    export * from 'doric/lib/src/widget/flexScroller';
 }
 
 declare module 'doric/lib/src/native/index.native' {
@@ -465,7 +466,7 @@ declare module 'doric/lib/src/widget/layouts' {
     export function vlayout(views: View[], config?: IVLayout): VLayout;
     export class FlexLayout extends Group {
     }
-    export function flexlayout(views: View[], config: IView): FlexLayout;
+    export function flexlayout(views: View[], config?: IView): FlexLayout;
     export {};
 }
 
@@ -870,6 +871,40 @@ declare module 'doric/lib/src/widget/switch' {
     export function switchView(config: ISwitch): Switch;
 }
 
+declare module 'doric/lib/src/widget/flexScroller' {
+    import { View, IView, Group } from 'doric/lib/src/ui/view';
+    import { BridgeContext } from 'doric/lib/src/runtime/global';
+    export function flexScroller(views: View[], config?: IFlexScroller): FlexScroller;
+    export interface IFlexScroller extends IView {
+        contentOffset?: {
+            x: number;
+            y: number;
+        };
+    }
+    export 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<any>;
+        scrollBy(context: BridgeContext, offset: {
+            x: number;
+            y: number;
+        }, animated?: boolean): Promise<any>;
+    }
+}
+
 declare module 'doric/lib/src/native/modal' {
     import { BridgeContext } from "doric/lib/src/runtime/global";
     import { Gravity } from "doric/lib/src/util/gravity";

doric-js/lib/src/widget/flexScroller.d.ts

@@ -0,0 +1,31 @@
+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<any>;
+    scrollBy(context: BridgeContext, offset: {
+        x: number;
+        y: number;
+    }, animated?: boolean): Promise<any>;
+}

doric-js/lib/src/widget/flexScroller.js

@@ -0,0 +1,59 @@
+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);

doric-js/lib/src/widget/index.widget.d.ts

@@ -10,3 +10,4 @@ export * from './input';
 export * from './nestedSlider';
 export * from './draggable';
 export * from './switch';
+export * from './flexScroller';

doric-js/lib/src/widget/index.widget.js

@@ -25,3 +25,4 @@ export * from './input';
 export * from './nestedSlider';
 export * from './draggable';
 export * from './switch';
+export * from './flexScroller';

doric-js/lib/src/widget/layouts.d.ts

@@ -27,5 +27,5 @@ export declare function hlayout(views: View[], config?: IHLayout): HLayout;
 export declare function vlayout(views: View[], config?: IVLayout): VLayout;
 export declare class FlexLayout extends Group {
 }
-export declare function flexlayout(views: View[], config: IView): FlexLayout;
+export declare function flexlayout(views: View[], config?: IView): FlexLayout;
 export {};

doric-js/src/widget/flexScroller.ts

@@ -0,0 +1,56 @@
+/*
+ * 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 { View, IView, Property, Group } from '../ui/view'
+import { layoutConfig } from '../util/layoutconfig'
+import { BridgeContext } from '../runtime/global'
+
+export function flexScroller(views: View[], config?: IFlexScroller) {
+    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 interface IFlexScroller extends IView {
+    contentOffset?: { x: number, y: number }
+}
+
+export class FlexScroller extends Group implements IFlexScroller {
+
+    @Property
+    contentOffset?: { x: number, y: number }
+
+    @Property
+    onScroll?: (offset: { x: number, y: number }) => void
+
+    @Property
+    onScrollEnd?: (offset: { x: number, y: number }) => void
+
+    scrollTo(context: BridgeContext, offset: { x: number, y: number }, animated?: boolean) {
+        return this.nativeChannel(context, "scrollTo")({ offset, animated })
+    }
+
+    scrollBy(context: BridgeContext, offset: { x: number, y: number }, animated?: boolean) {
+        return this.nativeChannel(context, "scrollBy")({ offset, animated })
+    }
+}

doric-js/src/widget/index.widget.ts

@@ -24,4 +24,5 @@ export * from './flowlayout'
 export * from './input'
 export * from './nestedSlider'
 export * from './draggable'
-export * from './switch'
+export * from './switch'
+export * from './flexScroller'

doric-js/src/widget/layouts.ts

@@ -98,7 +98,7 @@ export function vlayout(views: View[], config?: IVLayout) {
 export class FlexLayout extends Group {
 }
 
-export function flexlayout(views: View[], config: IView) {
+export function flexlayout(views: View[], config?: IView) {
     const ret = new FlexLayout
     ret.layoutConfig = layoutConfig().fit()
     for (let v of views) {