oolib 2.17.13 → 2.17.14

package/dist/components/Loader/index.d.ts

@@ -1 +1,4 @@
-export function Loader(props: any): JSX.Element;
+export function Loader({ isBlock, ...props }: {
+    [x: string]: any;
+    isBlock?: boolean;
+}): JSX.Element;

package/dist/components/Loader/index.js

@@ -10,6 +10,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,32 +33,34 @@ var styled_components_1 = require("styled-components");
 var greyColor100 = colors_1.colors.greyColor100;
 var styled_1 = require("./styled");
 var LoaderDiv = function (_a) {
-    var L = _a.L, _b = _a.M, M = _b === void 0 ? true : _b, S = _a.S, children = _a.children, _text = _a.text, debug = _a.debug, invert = _a.invert, _c = _a.isBlock, isBlock = _c === void 0 ? true : _c;
+    var L = _a.L, M = _a.M, S = _a.S, children = _a.children, _text = _a.text, debug = _a.debug, invert = _a.invert, _b = _a.isBlock, isBlock = _b === void 0 ? true : _b;
     var theme = (0, styled_components_1.useTheme)();
     var text = _text || children;
+    //defaults to M if neither are specified
     var getTypoSizeAndTrackSize = function (_a) {
         var L = _a.L, M = _a.M, S = _a.S;
         switch (true) {
             case L:
                 return { TypoComp: Typo_1.SANS_4_5, trackSize: 10, size: 70 };
-            case M:
-                return { TypoComp: Typo_1.SANS_3, trackSize: 7, size: 43 };
             case S:
-            default:
                 return { TypoComp: Typo_1.SANS_2, trackSize: 3.65, size: 21.35 };
+            case M:
+            default:
+                return { TypoComp: Typo_1.SANS_3, trackSize: 7, size: 43 };
         }
     };
-    var _d = getTypoSizeAndTrackSize({ L: L, M: M, S: S }), TypoComp = _d.TypoComp, trackSize = _d.trackSize, size = _d.size;
+    var _c = getTypoSizeAndTrackSize({ L: L, M: M, S: S }), TypoComp = _c.TypoComp, trackSize = _c.trackSize, size = _c.size;
     return (react_1.default.createElement(styled_1.StyledLoaderWrapper, __assign({}, { isBlock: isBlock }),
         react_1.default.createElement(styled_1.StyledLoader, __assign({}, { size: size, trackSize: trackSize, invert: invert })),
         (text || ((theme === null || theme === void 0 ? void 0 : theme._Env) === "dev" && debug)) && (react_1.default.createElement(TypoComp, __assign({ invert: invert }, (L ? { bold: true } : { semibold: true })), "".concat((theme === null || theme === void 0 ? void 0 : theme._Env) === "dev" && debug ? debug : "").concat(text)))));
 };
-// still dont think we need to have this overlay thing, 
+// still dont think we need to have this overlay thing,
 // but lets consult with design and make a decision on this
-//also i think the gap between loader and text should also be modified dynamically based on 
+//also i think the gap between loader and text should also be modified dynamically based on
 //size L, M or S
-var Loader = function (props) {
-    return !props.isBlock ? (react_1.default.createElement(LoaderDiv, __assign({}, props))) : (react_1.default.createElement(styled_1.StyledLoaderOverlay, __assign({}, props),
-        react_1.default.createElement(LoaderDiv, __assign({}, props))));
-};
+function Loader(_a) {
+    var _b = _a.isBlock, isBlock = _b === void 0 ? true : _b, props = __rest(_a, ["isBlock"]);
+    var renderLoaderDiv = function () { return react_1.default.createElement(LoaderDiv, __assign({}, __assign(__assign({}, props), { isBlock: isBlock }))); };
+    return !isBlock ? (renderLoaderDiv()) : (react_1.default.createElement(styled_1.StyledLoaderOverlay, __assign({}, { blockHeight: props.blockHeight }), renderLoaderDiv()));
+}
 exports.Loader = Loader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oolib",
-  "version": "2.17.13",
+  "version": "2.17.14",
   "description": " OKE Component Library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",