not-bulma 1.0.63 → 1.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-bulma",
-  "version": "1.0.63",
+  "version": "1.0.64",
   "description": "not-* family UI components on Bulma CSS Framework",
   "main": "src/index.js",
   "svelte": "src/index.js",

package/src/frame/app.js

@@ -1,208 +1,230 @@
-import notCommon from './common.js';
-import notRecord from './record.js';
-import notBase from './base.js';
-import notRouter from './router.js';
+import notCommon from "./common.js";
+import notRecord from "./record.js";
+import notBase from "./base.js";
+import notRouter from "./router.js";
 
-const OPT_CONTROLLER_PREFIX = 'nc',
-  OPT_RECORD_PREFIX = 'nr',
-  DEFAULT_WS_CLIENT_NAME = 'main';
+const OPT_CONTROLLER_PREFIX = "nc",
+    OPT_RECORD_PREFIX = "nr",
+    DEFAULT_WS_CLIENT_NAME = "main";
 
 export default class notApp extends notBase {
-  static DEFAULT_WS_CLIENT_NAME = DEFAULT_WS_CLIENT_NAME;
-  constructor(options) {
-    super({
-      working: {
-        name: options.name,
-        interfaces: {},
-        controllers: Object.prototype.hasOwnProperty.call(options, 'controllers') ? options.controllers : {},
-        initController: null,
-        currentController: null,
-        uis: {},
-        wsc: {},
-        wss: {},
-        services: {}
-      },
-      options
-    });
-    this.log('start app');
-    notCommon.register('app', this);
-    this.initManifest();
-    return this;
-  }
-
-  initManifest() {
-    notCommon.getJSON(this.getOptions('manifestURL'), {})
-      .then(this.setInterfaceManifest.bind(this))
-      .catch(notCommon.report.bind(this));
-  }
-
-  initRouter() {
-    this.setWorking('router', notRouter);
-    this.getWorking('router').setRoot(this.getOptions('router.root'));
-    notRouter.reRouteExisted();
-  }
-
-  execRouter() {
-    var routieInput = {};
-    for (let t = 0; t < this.getOptions('router.manifest').length; t++) {
-      let routeBlock = this.getOptions('router.manifest')[t],
-        paths = routeBlock.paths,
-        schemes = routeBlock.schemes,
-        controller = routeBlock.controller;
-      for (let i = 0; i < paths.length; i++) {
-        let pathScheme = (schemes && Array.isArray(schemes) && schemes.length > i) ? schemes[i] : false;
-        routieInput[paths[i]] = this.bindController(controller, pathScheme);
-      }
-    }
-    this.getWorking('router').addList(routieInput).listen(); //.navigate(this.getOptions('router.index'));
-  }
-
-  setInterfaceManifest(manifest) {
-    this.setOptions('interfaceManifest', manifest);
-    this.initRouter();
-    this.update();
-  }
-
-  getInterfaceManifest(modelName) {
-    if (modelName) {
-      return this.getOptions('interfaceManifest')[modelName];
-    } else {
-      return this.getOptions('interfaceManifest');
-    }
-  }
-
-  update() {
-    //нужно инициализировать
-    //модели полученными интерфейсами
-    this.updateInterfaces();
-    //иницилицировать и запустить контроллер инициализации
-    this.initController();
-    this.startApp();
-  }
-
-  startApp() {
-    this.initServices();
-    //создать контроллеры
-    //роутер и привязать к нему контроллеры
-    this.execRouter();
-    this.emit('afterStarted', this);
-  }
-
-  bindController(controllerName, controllerPathScheme) {
-    let app = this;
-    return function() {
-      new controllerName(app, arguments, controllerPathScheme);
-    };
-  }
-
-  initController() {
-    if (typeof(this.getOptions('initController')) !== 'undefined') {
-      let initController = this.getOptions('initController');
-      this.setWorking('initController', new initController(this));
-    }
-  }
-
-  getCurrentController() {
-    return this.getWorking('currentController');
-  }
-
-  setCurrentController(ctrl) {
-    let oldCtrl = this.getCurrentController();
-    if (oldCtrl && oldCtrl.destroy) {
-      oldCtrl.destroy();
-    }
-    this.setWorking('currentController', ctrl);
-    return this;
-  }
-
-  updateInterfaces() {
-    this.clearInterfaces();
-    let manifests = this.getOptions('interfaceManifest');
-    if (manifests) {
-      for (let name in manifests) {
-        let recordManifest = manifests[name],
-          recordMethods = this.getOptions(['models', name].join('.'), {});
-        recordManifest.methods = recordMethods;
-        this.getWorking('interfaces')[name] = (recordData) => new notRecord(recordManifest, recordData);
-        window['nr' + notCommon.capitalizeFirstLetter(name)] = this.getWorking('interfaces')[name];
-      }
-    }
-  }
-
-  getRecordName(name) {
-    return OPT_RECORD_PREFIX + notCommon.capitalizeFirstLetter(name);
-  }
-
-  getControllerName(name) {
-    return OPT_CONTROLLER_PREFIX + notCommon.capitalizeFirstLetter(name);
-  }
-
-  getInterfaces() {
-    return this.getWorking('interfaces');
-  }
-
-  clearInterfaces() {
-    this.setWorking('interfaces', {});
-    return this;
-  }
-
-  setWSClient(name = DEFAULT_WS_CLIENT_NAME, wsc) {
-    return this.setWorking(`wsc.${name}`, wsc);
-  }
-
-  getWSClient(name = DEFAULT_WS_CLIENT_NAME) {
-    return this.getWorking(`wsc.${name}`);
-  }
-
-  getInterface(name) {
-    return this.getInterfaces()[name];
-  }
-
-  getModel(name, data = {}) {
-    return this.getInterface(name)(data);
-  }
-
-  setService(name, val) {
-    return this.setWorking(`services.${name}`, val);
-  }
-
-  getService(name) {
-    return this.getWorking(`services.${name}`);
-  }
-
-  initServices() {
-    if (this.getOptions('services')) {
-      for (let servName in this.getOptions('services')) {
-        try {
-          let serv = this.getOptions(`services.${servName}`);
-          const servType = notCommon.detectType(serv);
-          switch (servType) {
-          case 'function':
-          case 'class':
-            this.setService(servName, new serv(this));
-            break;
-          default:
-            this.setService(servName, serv);
-          }
-        } catch (e) {
-          this.error(`Service (${servName}) init error`, e);
+    static DEFAULT_WS_CLIENT_NAME = DEFAULT_WS_CLIENT_NAME;
+    constructor(options) {
+        super({
+            working: {
+                name: options.name,
+                interfaces: {},
+                controllers: Object.prototype.hasOwnProperty.call(
+                    options,
+                    "controllers"
+                )
+                    ? options.controllers
+                    : {},
+                initController: null,
+                currentController: null,
+                uis: {},
+                wsc: {},
+                wss: {},
+                services: {},
+            },
+            options,
+        });
+        this.log("start app");
+        notCommon.register("app", this);
+        this.initManifest();
+        return this;
+    }
+
+    initManifest() {
+        notCommon
+            .getJSON(this.getOptions("manifestURL"), {})
+            .then(this.setInterfaceManifest.bind(this))
+            .catch(notCommon.report.bind(this));
+    }
+
+    initRouter() {
+        this.setWorking("router", notRouter);
+        this.getWorking("router").setRoot(this.getOptions("router.root"));
+        notRouter.reRouteExisted();
+    }
+
+    execRouter() {
+        var routieInput = {};
+        for (let t = 0; t < this.getOptions("router.manifest").length; t++) {
+            let routeBlock = this.getOptions("router.manifest")[t],
+                paths = routeBlock.paths,
+                schemes = routeBlock.schemes,
+                controller = routeBlock.controller;
+            for (let i = 0; i < paths.length; i++) {
+                let pathScheme =
+                    schemes && Array.isArray(schemes) && schemes.length > i
+                        ? schemes[i]
+                        : false;
+                routieInput[paths[i]] = this.bindController(
+                    controller,
+                    pathScheme
+                );
+            }
         }
-      }
+        this.getWorking("router").addList(routieInput).listen(); //.navigate(this.getOptions('router.index'));
     }
-  }
 
-  getConfigReaderForModule(moduleName = '') {
-    const modConfPath = ['modules', moduleName].join('.');
-    return {
-      get: (subPath, fallback) => {
-        if (subPath && typeof subPath == 'string' && subPath.length) {
-          return this.getOptions([modConfPath, subPath].join('.'), fallback);
+    setInterfaceManifest(manifest) {
+        this.setOptions("interfaceManifest", manifest);
+        this.initRouter();
+        this.update();
+    }
+
+    getInterfaceManifest(modelName) {
+        if (modelName) {
+            return this.getOptions("interfaceManifest")[modelName];
         } else {
-          return this.getOptions(modConfPath, fallback);
+            return this.getOptions("interfaceManifest");
+        }
+    }
+
+    update() {
+        //нужно инициализировать
+        //модели полученными интерфейсами
+        this.updateInterfaces();
+        //иницилицировать и запустить контроллер инициализации
+        this.initController();
+        this.startApp();
+    }
+
+    startApp() {
+        this.initServices();
+        //создать контроллеры
+        //роутер и привязать к нему контроллеры
+        this.execRouter();
+        this.emit("afterStarted", this);
+    }
+
+    bindController(controllerName, controllerPathScheme) {
+        let app = this;
+        return function () {
+            new controllerName(app, arguments, controllerPathScheme);
+        };
+    }
+
+    initController() {
+        if (typeof this.getOptions("initController") !== "undefined") {
+            let initController = this.getOptions("initController");
+            this.setWorking("initController", new initController(this));
         }
-      }
-    };
-  }
+    }
 
+    getCurrentController() {
+        return this.getWorking("currentController");
+    }
 
+    setCurrentController(ctrl) {
+        let oldCtrl = this.getCurrentController();
+        if (oldCtrl && oldCtrl.destroy) {
+            oldCtrl.destroy();
+        }
+        this.setWorking("currentController", ctrl);
+        return this;
+    }
+
+    updateInterfaces() {
+        this.clearInterfaces();
+        let manifests = this.getOptions("interfaceManifest");
+        if (manifests) {
+            for (let name in manifests) {
+                let recordManifest = manifests[name],
+                    recordMethods = this.getOptions(
+                        ["models", name].join("."),
+                        {}
+                    );
+                recordManifest.methods = recordMethods;
+                this.getWorking("interfaces")[name] = (recordData) =>
+                    new notRecord(recordManifest, recordData);
+                window["nr" + notCommon.capitalizeFirstLetter(name)] =
+                    this.getWorking("interfaces")[name];
+            }
+        }
+    }
+
+    getRecordName(name) {
+        return OPT_RECORD_PREFIX + notCommon.capitalizeFirstLetter(name);
+    }
+
+    getControllerName(name) {
+        return OPT_CONTROLLER_PREFIX + notCommon.capitalizeFirstLetter(name);
+    }
+
+    getInterfaces() {
+        return this.getWorking("interfaces");
+    }
+
+    clearInterfaces() {
+        this.setWorking("interfaces", {});
+        return this;
+    }
+
+    setWSClient(name = DEFAULT_WS_CLIENT_NAME, wsc) {
+        return this.setWorking(`wsc.${name}`, wsc);
+    }
+
+    getWSClient(name = DEFAULT_WS_CLIENT_NAME) {
+        return this.getWorking(`wsc.${name}`);
+    }
+
+    getInterface(name) {
+        return this.getInterfaces()[name];
+    }
+
+    getModel(name, data = {}) {
+        return this.getInterface(name)(data);
+    }
+
+    setService(name, val) {
+        return this.setWorking(`services.${name}`, val);
+    }
+
+    getService(name) {
+        return this.getWorking(`services.${name}`);
+    }
+
+    initServices() {
+        if (this.getOptions("services")) {
+            for (let servName in this.getOptions("services")) {
+                try {
+                    let serv = this.getOptions(`services.${servName}`);
+                    const servType = notCommon.detectType(serv);
+                    switch (servType) {
+                        case "function":
+                        case "class":
+                            this.setService(servName, new serv(this));
+                            break;
+                        default:
+                            this.setService(servName, serv);
+                    }
+                } catch (e) {
+                    this.error(`Service (${servName}) init error`, e);
+                }
+            }
+        }
+    }
+
+    getConfigReaderForModule(moduleName = "") {
+        const modConfPath = ["modules", moduleName].join(".");
+        return {
+            get: (subPath, fallback) => {
+                if (subPath && typeof subPath == "string" && subPath.length) {
+                    return this.getOptions(
+                        [modConfPath, subPath].join("."),
+                        fallback
+                    );
+                } else {
+                    return this.getOptions(modConfPath, fallback);
+                }
+            },
+        };
+    }
+
+    moduleConfig(moduleName = "") {
+        return this.getConfigReaderForModule(moduleName);
+    }
 }

package/src/frame/components/navigation/side/index.js

@@ -26,6 +26,7 @@ class notSideMenu extends Menu {
         navigate: (urls) => {
             if (this.isTouch()) {
                 this.hide();
+                this.app.emit("top-navbar-burger:update", { closed: true });
             }
             if (!this.isDirectNavigation() && this.app) {
                 let func = this.app.getWorking("router");

package/src/frame/components/navigation/top/ui.brand.svelte

@@ -1,15 +1,17 @@
 <script>
-  import UIIcon from '../../../../elements/icon/ui.icon.svelte';
-  export let url = '/';
-  export let title = '';
-  export let icon = {
-    src: 'https://via.placeholder.com/56x28',
-    width: 28,
-    height: 56
-  };
+    import UIIcon from "../../../../elements/icon/ui.icon.svelte";
+    export let url = "/";
+    export let title = "";
+    export let icon = {
+        src: "https://via.placeholder.com/56x28",
+        width: 28,
+        height: 56,
+    };
 </script>
 
-
-<a class="navbar-item" href="{url}">
-  <UIIcon {...icon}></UIIcon>{title?` ${title}`:''}
+<a class="navbar-item" href={url}>
+    <UIIcon {...icon} />
+    {#if title}
+        {@html `<span class="navbar-item-brand-title">${title}</span>`}
+    {/if}
 </a>

package/src/frame/components/navigation/top/ui.burger.svelte

@@ -1,46 +1,52 @@
 <script>
-  const COMPONENT_NAME = 'top-navbar-burger';
+    const COMPONENT_NAME = "top-navbar-burger";
 
-  import {
-    createEventDispatcher,
-    onMount
-  } from 'svelte';
-  const dispatch = createEventDispatcher();
+    import { createEventDispatcher, onMount } from "svelte";
 
-  import notCommon from '../../../common';
+    const dispatch = createEventDispatcher();
 
-  export let events = {};
-  export let register = notCommon.registerWidgetEvents.bind(notCommon);
+    import notCommon from "../../../common";
 
-  export let closed = true;
+    export let events = {};
+    export let register = notCommon.registerWidgetEvents.bind(notCommon);
 
-  function toggle(e) {
-    e.preventDefault();
-    closed = !closed;
-    dispatch('toggle', {
-      closed
-    });
-    return false;
-  }
-
-  function getStandartUpdateEventName() {
-    return COMPONENT_NAME + ':update';
-  }
+    export let closed = true;
 
-  export let onUpdate = (data) => {
-    closed = data.closed;
-  };
+    function toggle(e) {
+        e.preventDefault();
+        closed = !closed;
+        dispatch("toggle", {
+            closed,
+        });
+        return false;
+    }
 
-  onMount(() => {
-    if (!Object.prototype.hasOwnProperty.call(events, getStandartUpdateEventName())) {
-      events[getStandartUpdateEventName()] = onUpdate;
+    function getStandartUpdateEventName() {
+        return COMPONENT_NAME + ":update";
     }
-    register(events);
-  });
+
+    export let onUpdate = (data) => {
+        closed = data.closed;
+    };
+
+    onMount(() => {
+        if (!Object.hasOwn(events, getStandartUpdateEventName())) {
+            events[getStandartUpdateEventName()] = onUpdate;
+        }
+        register(events);
+    });
 </script>
 
-<a href on:click={toggle} role="button" class="navbar-burger {closed?'':'is-active'}" aria-label="menu" aria-expanded="false" data-target="navbar">
-  <span aria-hidden="true"></span>
-  <span aria-hidden="true"></span>
-  <span aria-hidden="true"></span>
+<a
+    href
+    on:click={toggle}
+    role="button"
+    class="navbar-burger {closed ? '' : 'is-active'}"
+    aria-label="menu"
+    aria-expanded="false"
+    data-target="navbar"
+>
+    <span aria-hidden="true" />
+    <span aria-hidden="true" />
+    <span aria-hidden="true" />
 </a>

package/src/scss/_menu.scss

@@ -81,3 +81,6 @@ a:not(.is-active) > span.is-no-link:hover{
 .menu-list li ul, .menu-list li ul li ul{
   margin-right: 0em!important;
 }
+.navbar-item-brand-title{
+  margin-left: 1rem;
+}