jsbox-cview 1.2.4 → 1.2.6

package/components/pageviewer.ts

@@ -50,7 +50,6 @@ export class PageViewer extends Base<UIView, UiTypes.ViewOptions> {
     this._pageWidth = 0;
     this._floatPage = this._props.page;
     const contentViews = this._props.cviews.map(n => {
-      n._layout = $layout.fill;
       return new ContentView({
         views: [n.definition],
         layout: (make, view) => {
@@ -93,7 +92,7 @@ export class PageViewer extends Base<UIView, UiTypes.ViewOptions> {
       return {
         type: "view",
         props: { id: this.id },
-        layout: this._layout,
+        layout,
         views: [this.scroll.definition],
         events: {
           layoutSubviews: sender => {

package/components/symbol-button.ts

@@ -50,6 +50,7 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
       tintColor: $color("primaryText"),
       ...props
     };
+    this._layout = layout;
     this._defineView = () => {
       return {
         type: "button",
@@ -76,7 +77,7 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
             }
           }
         ],
-        layout,
+        layout: this._layout,
         events
       };
     }

package/controller/pageviewer-controller.ts

@@ -44,7 +44,7 @@ export class PageViewerController extends BaseController {
     };
     this.cviews.pageviewer = new PageViewer({
       props: {
-        page: this._props.index,
+        page: this._props.index || 0,
         cviews: this._props.items.map(n => n.controller.rootView)
       },
       layout: (make, view) => {
@@ -58,7 +58,7 @@ export class PageViewerController extends BaseController {
     this.cviews.titlebar = new PageViewerTitleBar({
       props: {
         items: this._props.items.map(n => n.title),
-        index: this._props.index
+        index: this._props.index || 0
       },
       layout: $layout.fill,
       events: {

package/dist/components/pageviewer.js

@@ -25,7 +25,6 @@ class PageViewer extends base_1.Base {
         this._pageWidth = 0;
         this._floatPage = this._props.page;
         const contentViews = this._props.cviews.map(n => {
-            n._layout = $layout.fill;
             return new single_views_1.ContentView({
                 views: [n.definition],
                 layout: (make, view) => {
@@ -68,7 +67,7 @@ class PageViewer extends base_1.Base {
             return {
                 type: "view",
                 props: { id: this.id },
-                layout: this._layout,
+                layout,
                 views: [this.scroll.definition],
                 events: {
                     layoutSubviews: sender => {

package/dist/components/symbol-button.js

@@ -30,6 +30,7 @@ class SymbolButton extends base_1.Base {
     constructor({ props, layout, events = {} }) {
         super();
         this._props = Object.assign({ insets: $insets(12.5, 12.5, 12.5, 12.5), tintColor: $color("primaryText") }, props);
+        this._layout = layout;
         this._defineView = () => {
             return {
                 type: "button",
@@ -56,7 +57,7 @@ class SymbolButton extends base_1.Base {
                         }
                     }
                 ],
-                layout,
+                layout: this._layout,
                 events
             };
         };

package/dist/controller/pageviewer-controller.js

@@ -25,7 +25,7 @@ class PageViewerController extends base_controller_1.BaseController {
         this.cviews = {};
         this.cviews.pageviewer = new pageviewer_1.PageViewer({
             props: {
-                page: this._props.index,
+                page: this._props.index || 0,
                 cviews: this._props.items.map(n => n.controller.rootView)
             },
             layout: (make, view) => {
@@ -39,7 +39,7 @@ class PageViewerController extends base_controller_1.BaseController {
         this.cviews.titlebar = new pageviewer_titlebar_1.PageViewerTitleBar({
             props: {
                 items: this._props.items.map(n => n.title),
-                index: this._props.index
+                index: this._props.index || 0
             },
             layout: $layout.fill,
             events: {

package/dist/test/pageviewer-controller.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pageviewer_controller_1 = require("../controller/pageviewer-controller");
+const base_controller_1 = require("../controller/base-controller");
+const items = [{
+        controller: new base_controller_1.BaseController({ props: { bgcolor: $color("red") } }),
+        title: "Page 1"
+    }, {
+        controller: new base_controller_1.BaseController({ props: { bgcolor: $color("yellow") } }),
+        title: "Page 2"
+    }];
+const pageViewerController = new pageviewer_controller_1.PageViewerController({
+    props: {
+        items
+    }
+});
+pageViewerController.uirender({});

package/dist/test/pageviewer-titlebar.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pageviewer_titlebar_1 = require("../components/pageviewer-titlebar");
+const pageViewerTitleBar = new pageviewer_titlebar_1.PageViewerTitleBar({
+    props: {
+        items: ["Page 1", "Page 2", "Page 3"],
+        index: 0
+    },
+    layout: (make, view) => {
+        make.left.right.inset(0);
+        make.top.equalTo(view.super.safeAreaTop);
+        make.height.equalTo(44);
+    },
+    events: {}
+});
+$ui.render({
+    views: [pageViewerTitleBar.definition]
+});

package/dist/test/pageviewer.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pageviewer_1 = require("../components/pageviewer");
+const single_views_1 = require("../components/single-views");
+const pageViewer = new pageviewer_1.PageViewer({
+    props: {
+        page: 0,
+        cviews: [
+            new single_views_1.ContentView({ props: { bgcolor: $color("red") }, layout: $layout.fill }),
+            new single_views_1.ContentView({ props: { bgcolor: $color("green") }, layout: $layout.fill }),
+            new single_views_1.ContentView({ props: { bgcolor: $color("blue") }, layout: $layout.fill })
+        ]
+    },
+    layout: $layout.fill,
+    events: {
+        floatPageChanged: (cview, floatPage) => {
+            console.log(floatPage);
+        }
+    }
+});
+$ui.render({
+    views: [pageViewer.definition]
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsbox-cview",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "为 JSBox 设计的微型框架",
   "repository": {
     "type": "git",

package/test/pageviewer-controller.ts

@@ -0,0 +1,19 @@
+import { PageViewerController } from "../controller/pageviewer-controller";
+import { BaseController } from "../controller/base-controller";
+import { PageViewer } from "../components/pageviewer";
+
+const items = [{
+  controller: new BaseController({props: {bgcolor: $color("red")}}),
+  title: "Page 1"
+}, {
+  controller: new BaseController({props: {bgcolor: $color("yellow")}}),
+  title: "Page 2"
+}]
+
+const pageViewerController = new PageViewerController({
+  props: {
+    items
+  }
+});
+
+pageViewerController.uirender({});

package/test/pageviewer-titlebar.ts

@@ -0,0 +1,19 @@
+import { PageViewerTitleBar } from "../components/pageviewer-titlebar";
+
+const pageViewerTitleBar = new PageViewerTitleBar({
+  props: {
+    items: ["Page 1", "Page 2", "Page 3"],
+    index: 0
+  },
+  layout: (make, view) => {
+    make.left.right.inset(0);
+    make.top.equalTo(view.super.safeAreaTop);
+    make.height.equalTo(44);
+  },
+  events: {
+  }
+});
+
+$ui.render({
+  views: [pageViewerTitleBar.definition]
+});

package/test/pageviewer.ts

@@ -0,0 +1,22 @@
+import { PageViewer } from "../components/pageviewer";
+import { ContentView } from "../components/single-views";
+const pageViewer = new PageViewer({
+  props: {
+    page: 0,
+    cviews: [
+      new ContentView({ props: { bgcolor: $color("red") }, layout: $layout.fill }),
+      new ContentView({ props: { bgcolor: $color("green") }, layout: $layout.fill }),
+      new ContentView({ props: { bgcolor: $color("blue") }, layout: $layout.fill })
+    ]
+  },
+  layout: $layout.fill,
+  events: {
+    floatPageChanged: (cview, floatPage) => {
+      console.log(floatPage);
+    }
+  }
+});
+
+$ui.render({
+  views: [pageViewer.definition]
+});