bobril - npm Package Compare versions

Comparing version 16.0.0 to 16.1.0

CHANGELOG.md

 # CHANGELOG
 
-## 16.0.0
+## 16.1.0
 
-Nominal types `Nominal<string,"Bobril">`.
+Temporary revert of Bobril 16.0.0
 
-`IBobrilStyleDef` is now not plain string but nominal type.
-
-`sprite` without color creates another nominal type `ColorlessSprite`. `spriteWithColor` now takes only `ColorlessSprite` type making it compile time type safe, function for evaluation could be also passed.
-
-New method `svg` allows to embed svg in JS source and then use it as `ColorlessSprite`. It is not expected to directly use `svg` method but instead `sprite` and bobril-build will load svg from disk and change that call to this method.
-
-New method `svgWithColor` allows to resize previously defined svg or recolor multiple colors not just `gray` for which you can still use `spriteWithColor`.
-
-When you need to use jQuery selectors with Bobril and you already have nice `key` in VDom to use with `bbseeker`, you can now enable automatic publishing of keys to classNames by `b.setKeysInClassNames(true); b.ignoreShouldChange();` without need to change your application.
-
 ## 15.2.0
@@ -48,3 +38,3 @@
     style={() => {
-        let s = b.useState(0);
+        let s = b.useStore(0);
         s((s() + 1) % 101);
@@ -51,0 +41,0 @@ return { opacity: s() * 0.01 };

index.ts

@@ -17,3 +17,3 @@ import "./src/ie11";
 import { setAfterFrame, setBeforeFrame } from "./src/frameCallbacks";
-import { deref, getRoots, setInvalidate, ignoreShouldChange, setBeforeInit, setKeysInClassNames } from "./src/core";
+import { deref, getRoots, setInvalidate, ignoreShouldChange, setBeforeInit } from "./src/core";
 import { getDnds } from "./src/dnd";
@@ -35,3 +35,2 @@ import { invalidateStyles } from "./src/cssInJs";
         setBeforeInit,
-        setKeysInClassNames,
     };

package.json

 {
     "name": "bobril",
-    "version": "16.0.0",
+    "version": "16.1.0",
     "description": "Component Oriented MVC Framework with virtual DOM and CSS",
@@ -5,0 +5,0 @@ "main": "index.js",

src/cssInJs.ts

 import { CSSStyles, CSSPseudoStyles, CSSStylesItem, CSSInlineStyles } from "./cssTypes";
 import {
     applyDynamicStyle,
-    ColorlessSprite,
     destroyDynamicStyle,
@@ -197,7 +196,2 @@ IBobrilCacheNode,
 
-interface ISvgSprite {
-    styleId: IBobrilStyleDef;
-    svg: string;
-}
-
 interface IDynamicSprite extends ISprite {
@@ -226,3 +220,3 @@ color: () => string;
     realName: string | null;
-    parent?: string | IBobrilStyleDef | IBobrilStyleDef[];
+    parent?: IBobrilStyleDef | IBobrilStyleDef[];
     style: CSSStyles | (() => [CSSStyles, CSSPseudoStyles]);
@@ -249,3 +243,2 @@ pseudo?: CSSPseudoStyles;
 var dynamicSprites: IDynamicSprite[] = [];
-var svgSprites = new Map<string, ColorlessSprite>();
 var bundledDynamicSprites: IResponsiveDynamicSprite[] = [];
@@ -543,3 +536,3 @@ var imageCache: { [url: string]: HTMLImageElement | null } = newHashObj();
             if (sd != undefined) {
-                s = sd.realName! as IBobrilStyleDef;
+                s = sd.realName!;
             }
@@ -705,3 +698,3 @@ if (className == undefined) className = s;
     } else invalidateStyles();
-    return nameHint as IBobrilStyleDef;
+    return nameHint;
 }
@@ -817,3 +810,3 @@
 let imagesWithCredentials = false;
-const colorLessSpriteMap = new Map<string, ISprite | IResponsiveSprite | ISvgSprite>();
+const colorLessSpriteMap = new Map<string, ISprite | IResponsiveSprite>();
 
@@ -831,6 +824,5 @@ function loadImage(url: string, onload: (image: HTMLImageElement) => void) {
 
-export function sprite(url: string): ColorlessSprite;
 export function sprite(
     url: string,
-    color: null | undefined,
+    color?: string | (() => string),
     width?: number,
@@ -840,19 +832,2 @@ height?: number,
     top?: number
-): ColorlessSprite;
-export function sprite(
-    url: string,
-    color: string | (() => string),
-    width?: number,
-    height?: number,
-    left?: number,
-    top?: number
-): IBobrilStyleDef;
-
-export function sprite(
-    url: string,
-    color?: string | (() => string) | null | undefined,
-    width?: number,
-    height?: number,
-    left?: number,
-    top?: number
 ): IBobrilStyleDef {
@@ -911,81 +886,2 @@ assert(allStyles[url] === undefined, "Wrong sprite url");
 
-export function svg(content: string): ColorlessSprite {
-    var key = content + ":1";
-    var styleId = svgSprites.get(key);
-    if (styleId !== undefined) return styleId;
-    styleId = buildSvgStyle(content, 1);
-    var svgSprite: ISvgSprite = {
-        styleId,
-        svg: content,
-    };
-    svgSprites.set(key, styleId);
-    colorLessSpriteMap.set(styleId, svgSprite);
-    return styleId;
-}
-
-/// Function can take colors as functions but they are evaluated immediately => use only in render like function
-export function svgWithColor(
-    id: ColorlessSprite,
-    colors: string | (() => string) | Record<string, string | (() => string)>,
-    size: number = 1
-): IBobrilStyleDef {
-    var original = colorLessSpriteMap.get(id);
-    if (DEBUG && (original == undefined || !("svg" in original))) throw new Error(id + " is not colorless svg");
-    var key = (original! as ISvgSprite).svg + ":" + size;
-    if (isFunction(colors)) {
-        colors = colors();
-        key += ":gray:" + colors;
-    } else if (isString(colors)) {
-        key += ":gray:" + colors;
-    } else
-        for (let ckey in colors) {
-            if (hOP.call(colors, ckey)) {
-                let val = colors[ckey];
-                if (isFunction(val)) val = val();
-                key += ":" + ckey + ":" + val;
-            }
-        }
-    var styleId = svgSprites.get(key);
-    if (styleId !== undefined) return styleId;
-    var colorsMap = new Map<string, string>();
-    if (isString(colors)) {
-        colorsMap.set("gray", colors);
-    } else
-        for (let ckey in colors) {
-            if (hOP.call(colors, ckey)) {
-                let val = colors[ckey];
-                if (isFunction(val)) val = val();
-                colorsMap.set(ckey, val as string);
-            }
-        }
-
-    styleId = buildSvgStyle(
-        (original! as ISvgSprite).svg.replace(/[\":][A-Z-]+[\";]/gi, (m) => {
-            var c = colorsMap.get(m.substr(1, m.length - 2));
-            return c !== undefined ? m[0] + c + m[m.length - 1] : m;
-        }),
-        size
-    );
-    svgSprites.set(key, styleId);
-    return styleId;
-}
-
-function buildSvgStyle(content: string, size: number): ColorlessSprite {
-    var sizeStr = content.split('"', 1)[0];
-    var [width, height] = sizeStr!.split(" ").map((s) => parseFloat(s) * size);
-    var backgroundImage =
-        'url("data:image/svg+xml,' +
-        encodeURIComponent(
-            '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="' +
-                width +
-                '" height="' +
-                height +
-                '" viewBox="0 0 ' +
-                content +
-                "</svg>"
-        ) +
-        '")';
-    return styleDef({ width, height, backgroundImage }) as ColorlessSprite;
-}
-
 var bundlePath = (<any>window)["bobrilBPath"] || "bundle.png";
@@ -1066,12 +962,9 @@ var bundlePath2: [string, number][] = (<any>window)["bobrilBPath2"] || [];
 
-/// Function can take colors as functions but they are evaluated immediately => use only in render like function
-export function spriteWithColor(colorLessSprite: ColorlessSprite, color: string | (() => string)): IBobrilStyleDef {
+export function spriteWithColor(colorLessSprite: IBobrilStyleDef, color: string): IBobrilStyleDef {
     const original = colorLessSpriteMap.get(colorLessSprite);
-    if (DEBUG && original == undefined) throw new Error(colorLessSprite + " is not colorless sprite");
-    if ("svg" in original!) {
-        return svgWithColor(colorLessSprite, { gray: color }, 1);
-    } else if ("url" in original!) {
+    if (original == undefined) throw new Error(colorLessSprite + " is not colorless sprite");
+    if ("url" in original) {
         return sprite(original.url, color, original.width, original.height, original.left, original.top);
     } else {
-        return spritebc(color, original!.width, original!.height, original!.left, original!.top);
+        return spritebc(color, original.width, original.height, original.left, original.top);
     }
@@ -1078,0 +971,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

376101

decreased by-1.42%

Lines of code

9000

decreased by-1.34%

No dependency changes