verstak 0.95.25044 → 0.95.25046

package/build/dist/source/components/Button.v.js

@@ -1,6 +1,6 @@
 import { ReactiveTreeNode, Mode, derivative } from "reactronic";
 import { Block, JustText, OnClick } from "verstak";
-import { observableModel } from "./common/Utils.js";
+import { sxModel } from "./common/Utils.js";
 import { Theme } from "./Theme.js";
 import { Icon } from "./Icon.v.js";
 export function Button(declaration) {
@@ -8,7 +8,7 @@ export function Button(declaration) {
         mode: Mode.autonomous,
         preparation: el => {
             var _a;
-            (_a = el.model) !== null && _a !== void 0 ? _a : (el.model = observableModel({
+            (_a = el.model) !== null && _a !== void 0 ? _a : (el.model = sxModel({
                 icon: "fa-solid fa-square",
                 label: ReactiveTreeNode.current.key,
             }));

package/build/dist/source/components/Image.v.js

@@ -1,12 +1,12 @@
 import { Mode, derivative } from "reactronic";
 import { Block } from "verstak";
-import { observableModel } from "./common/Utils.js";
+import { sxModel } from "./common/Utils.js";
 export function Image(declaration) {
     return (Block(derivative(declaration, {
         mode: Mode.autonomous,
         preparation: el => {
             var _a;
-            (_a = el.model) !== null && _a !== void 0 ? _a : (el.model = observableModel({ source: undefined }));
+            (_a = el.model) !== null && _a !== void 0 ? _a : (el.model = sxModel({ source: undefined }));
         },
         script: el => {
             const m = el.model;

package/build/dist/source/components/Input.v.js

@@ -1,6 +1,6 @@
 import { Mode, derivative } from "reactronic";
 import { Block, JustText, OnFocus, rowBreak, Fragment, KeyboardModifiers, Horizontal, Vertical } from "verstak";
-import { observableModel } from "./common/Utils.js";
+import { sxModel } from "./common/Utils.js";
 import { Theme } from "./Theme.js";
 import { Icon } from "./Icon.v.js";
 export function Input(declaration) {
@@ -29,7 +29,7 @@ export function Input(declaration) {
 }
 export function composeInputModel(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    return observableModel({
+    return sxModel({
         icon: props === null || props === void 0 ? void 0 : props.icon,
         text: (_a = props === null || props === void 0 ? void 0 : props.text) !== null && _a !== void 0 ? _a : "",
         options: (_b = props === null || props === void 0 ? void 0 : props.options) !== null && _b !== void 0 ? _b : [],

package/build/dist/source/components/Spinner.v.js

@@ -1,6 +1,6 @@
 import { Mode, derivative } from "reactronic";
 import { Block, JustText } from "verstak";
-import { observableModel } from "./common/Utils.js";
+import { sxModel } from "./common/Utils.js";
 export function Spinner(declaration) {
     return (Block(derivative(declaration, {
         mode: Mode.autonomous,
@@ -16,7 +16,7 @@ export function Spinner(declaration) {
 }
 export function composeSpinnerModel(props) {
     var _a, _b;
-    return observableModel({
+    return sxModel({
         active: (_a = props === null || props === void 0 ? void 0 : props.active) !== null && _a !== void 0 ? _a : false,
         color: (_b = props === null || props === void 0 ? void 0 : props.color) !== null && _b !== void 0 ? _b : "",
     });

package/build/dist/source/components/Toggle.v.js

@@ -1,6 +1,6 @@
 import { ReactiveTreeNode, Mode, derivative } from "reactronic";
 import { Block, JustText, OnClick } from "verstak";
-import { observableModel } from "./common/Utils.js";
+import { sxModel } from "./common/Utils.js";
 import { Theme } from "./Theme.js";
 import { Icon } from "./Icon.v.js";
 export function Toggle(declaration) {
@@ -8,7 +8,7 @@ export function Toggle(declaration) {
         mode: Mode.autonomous,
         preparation: el => {
             var _a;
-            (_a = el.model) !== null && _a !== void 0 ? _a : (el.model = observableModel({
+            (_a = el.model) !== null && _a !== void 0 ? _a : (el.model = sxModel({
                 label: ReactiveTreeNode.current.key,
                 checked: true,
                 color: "green"

package/build/dist/source/components/api.d.ts

@@ -6,5 +6,5 @@ export * from "./Spinner.v.js";
 export * from "./Toggle.v.js";
 export * from "./Markdown.v.js";
 export * from "./Theme.js";
-export { observableModel } from "./common/Utils.js";
+export { sxModel } from "./common/Utils.js";
 export { RealTimeClock } from "./RealTimeClock.js";

package/build/dist/source/components/api.js

@@ -6,5 +6,5 @@ export * from "./Spinner.v.js";
 export * from "./Toggle.v.js";
 export * from "./Markdown.v.js";
 export * from "./Theme.js";
-export { observableModel } from "./common/Utils.js";
+export { sxModel } from "./common/Utils.js";
 export { RealTimeClock } from "./RealTimeClock.js";

package/build/dist/source/components/common/Utils.d.ts

@@ -2,4 +2,4 @@ import { Ref } from "reactronic";
 export type ValuesOrRefs<T> = {
     [K in keyof T]: T[K] | Ref<T[K]>;
 };
-export declare function observableModel<T extends Object>(modelProps: ValuesOrRefs<T>): T;
+export declare function sxModel<T extends Object>(modelProps: ValuesOrRefs<T>): T;

package/build/dist/source/components/common/Utils.js

@@ -1,8 +1,8 @@
 import { SxObject, Ref, runTransactional, Isolation } from "reactronic";
-export function observableModel(modelProps) {
-    return runTransactional({ isolation: Isolation.disjoinFromOuterTransaction }, () => new ObservableComposition(modelProps));
+export function sxModel(modelProps) {
+    return runTransactional({ isolation: Isolation.disjoinFromOuterTransaction }, () => new SxComposition(modelProps));
 }
-class ObservableComposition extends SxObject {
+class SxComposition extends SxObject {
     constructor(composition) {
         super();
         convertValuesToFieldsAndRefsToGetSet(this, composition);

package/build/dist/source/core/Elements.js

@@ -222,8 +222,8 @@ export function isSplitViewPartition(childDriver) {
 function overrideMethod(declaration, method, func) {
     const baseScript = declaration[method];
     declaration[method] = baseScript !== undefined
-        ? (el, base) => { baseScript(el, base); func(el); }
-        : (el, base) => { base(); func(el); };
+        ? (el, base) => { baseScript.call(el, el, base); func.call(el, el); }
+        : (el, base) => { base(); func.call(el, el); };
 }
 export class PartitionDriver extends HtmlDriver {
     runScript(node) {

package/build/dist/source/core/Restyler.d.ts

@@ -1,5 +1,5 @@
-export declare function restyler<T>(restyle: () => T): ObservableStyles<T>;
-export declare class ObservableStyles<T> {
+export declare function restyler<T>(restyle: () => T): SxStyles<T>;
+export declare class SxStyles<T> {
     private readonly restyle;
     constructor(restyle: () => T);
     protected cache(): T;

package/build/dist/source/core/Restyler.js

@@ -9,9 +9,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { cache, runTransactional } from "reactronic";
 export function restyler(restyle) {
-    return runTransactional(() => new ObservableStyles(restyle));
+    return runTransactional(() => new SxStyles(restyle));
 }
-export class ObservableStyles {
+export class SxStyles {
     constructor(restyle) {
         this.restyle = restyle;
     }
@@ -27,4 +27,4 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Object)
-], ObservableStyles.prototype, "cache", null);
+], SxStyles.prototype, "cache", null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verstak",
-  "version": "0.95.25044",
+  "version": "0.95.25046",
   "description": "Verstak - Front-End Library",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
     "markdown-it": "^14.1.0",
     "markdown-it-prism": "^2.3.0",
     "prismjs": "^1.30.0",
-    "reactronic": "^0.95.25043"
+    "reactronic": "^0.95.25046"
   },
   "devDependencies": {
     "@types/markdown-it": "14.1.2",