@sb1/ffe-grid-react 14.0.2 → 14.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/Grid.js CHANGED
@@ -22,10 +22,22 @@ var __rest = (this && this.__rest) || function (s, e) {
22
22
  };
23
23
  import React from 'react';
24
24
  import classNames from 'classnames';
25
+ var sizeClasses = function (size, def) {
26
+ var _a;
27
+ if (def === undefined) {
28
+ return null;
29
+ }
30
+ else if (typeof def === 'string') {
31
+ return "ffe-grid--gap-".concat(size, "-").concat(def);
32
+ }
33
+ return classNames((_a = {},
34
+ _a["ffe-grid--".concat(size, "-gap-").concat(def.gap)] = def.gap,
35
+ _a));
36
+ };
25
37
  export var Grid = function (_a) {
26
38
  var _b;
27
- var children = _a.children, className = _a.className, gap = _a.gap, _c = _a.as, Comp = _c === void 0 ? 'div' : _c, rest = __rest(_a, ["children", "className", "gap", "as"]);
39
+ var children = _a.children, className = _a.className, gap = _a.gap, sm = _a.sm, md = _a.md, lg = _a.lg, _c = _a.as, Comp = _c === void 0 ? 'div' : _c, rest = __rest(_a, ["children", "className", "gap", "sm", "md", "lg", "as"]);
28
40
  return (React.createElement(Comp, __assign({ className: classNames(className, 'ffe-grid', (_b = {},
29
41
  _b["ffe-grid--gap-".concat(gap)] = gap,
30
- _b)) }, rest), children));
42
+ _b), sizeClasses('lg', lg), sizeClasses('md', md), sizeClasses('sm', sm)) }, rest), children));
31
43
  };
package/es/GridRow.js CHANGED
@@ -22,13 +22,26 @@ var __rest = (this && this.__rest) || function (s, e) {
22
22
  };
23
23
  import React from 'react';
24
24
  import classNames from 'classnames';
25
+ var sizeClasses = function (size, def) {
26
+ var _a;
27
+ if (def === undefined) {
28
+ return null;
29
+ }
30
+ else if (typeof def === 'string') {
31
+ return "ffe-grid__row--".concat(size, "-").concat(def);
32
+ }
33
+ return classNames((_a = {},
34
+ _a["ffe-grid__row--".concat(size, "-margin-").concat(def.margin)] = def.margin,
35
+ _a["ffe-grid__row--".concat(size, "-padding-").concat(def.padding)] = def.padding,
36
+ _a));
37
+ };
25
38
  export var GridRow = function (_a) {
26
39
  var _b, _c, _d, _e;
27
- var background = _a.background, backgroundDark = _a.backgroundDark, className = _a.className, children = _a.children, _f = _a.as, Comp = _f === void 0 ? 'div' : _f, padding = _a.padding, margin = _a.margin, rest = __rest(_a, ["background", "backgroundDark", "className", "children", "as", "padding", "margin"]);
40
+ var background = _a.background, backgroundDark = _a.backgroundDark, className = _a.className, children = _a.children, _f = _a.as, Comp = _f === void 0 ? 'div' : _f, sm = _a.sm, md = _a.md, lg = _a.lg, padding = _a.padding, margin = _a.margin, rest = __rest(_a, ["background", "backgroundDark", "className", "children", "as", "sm", "md", "lg", "padding", "margin"]);
28
41
  var hasBackgroundColor = !!background;
29
42
  var hasBackgroundDarkColor = !!backgroundDark;
30
43
  var content = hasBackgroundColor || hasBackgroundDarkColor ? (React.createElement("div", { className: "ffe-grid__row-wrapper" }, children)) : (children);
31
- return (React.createElement(Comp, __assign({ className: classNames(className, 'ffe-grid__row', (_b = {}, _b["ffe-grid__row--bg-".concat(background)] = hasBackgroundColor, _b), (_c = {},
44
+ return (React.createElement(Comp, __assign({ className: classNames(className, sizeClasses('lg', lg), sizeClasses('md', md), sizeClasses('sm', sm), 'ffe-grid__row', (_b = {}, _b["ffe-grid__row--bg-".concat(background)] = hasBackgroundColor, _b), (_c = {},
32
45
  _c["ffe-grid__row--bg-dark-".concat(backgroundDark)] = hasBackgroundDarkColor,
33
46
  _c), (_d = {}, _d["ffe-grid__row--padding-".concat(padding)] = padding, _d), (_e = {}, _e["ffe-grid__row--margin-".concat(margin)] = margin, _e)) }, rest), content));
34
47
  };
package/lib/Grid.js CHANGED
@@ -28,11 +28,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
28
28
  exports.Grid = void 0;
29
29
  var react_1 = __importDefault(require("react"));
30
30
  var classnames_1 = __importDefault(require("classnames"));
31
+ var sizeClasses = function (size, def) {
32
+ var _a;
33
+ if (def === undefined) {
34
+ return null;
35
+ }
36
+ else if (typeof def === 'string') {
37
+ return "ffe-grid--gap-".concat(size, "-").concat(def);
38
+ }
39
+ return (0, classnames_1.default)((_a = {},
40
+ _a["ffe-grid--".concat(size, "-gap-").concat(def.gap)] = def.gap,
41
+ _a));
42
+ };
31
43
  var Grid = function (_a) {
32
44
  var _b;
33
- var children = _a.children, className = _a.className, gap = _a.gap, _c = _a.as, Comp = _c === void 0 ? 'div' : _c, rest = __rest(_a, ["children", "className", "gap", "as"]);
45
+ var children = _a.children, className = _a.className, gap = _a.gap, sm = _a.sm, md = _a.md, lg = _a.lg, _c = _a.as, Comp = _c === void 0 ? 'div' : _c, rest = __rest(_a, ["children", "className", "gap", "sm", "md", "lg", "as"]);
34
46
  return (react_1.default.createElement(Comp, __assign({ className: (0, classnames_1.default)(className, 'ffe-grid', (_b = {},
35
47
  _b["ffe-grid--gap-".concat(gap)] = gap,
36
- _b)) }, rest), children));
48
+ _b), sizeClasses('lg', lg), sizeClasses('md', md), sizeClasses('sm', sm)) }, rest), children));
37
49
  };
38
50
  exports.Grid = Grid;
package/lib/GridRow.js CHANGED
@@ -28,13 +28,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
28
28
  exports.GridRow = void 0;
29
29
  var react_1 = __importDefault(require("react"));
30
30
  var classnames_1 = __importDefault(require("classnames"));
31
+ var sizeClasses = function (size, def) {
32
+ var _a;
33
+ if (def === undefined) {
34
+ return null;
35
+ }
36
+ else if (typeof def === 'string') {
37
+ return "ffe-grid__row--".concat(size, "-").concat(def);
38
+ }
39
+ return (0, classnames_1.default)((_a = {},
40
+ _a["ffe-grid__row--".concat(size, "-margin-").concat(def.margin)] = def.margin,
41
+ _a["ffe-grid__row--".concat(size, "-padding-").concat(def.padding)] = def.padding,
42
+ _a));
43
+ };
31
44
  var GridRow = function (_a) {
32
45
  var _b, _c, _d, _e;
33
- var background = _a.background, backgroundDark = _a.backgroundDark, className = _a.className, children = _a.children, _f = _a.as, Comp = _f === void 0 ? 'div' : _f, padding = _a.padding, margin = _a.margin, rest = __rest(_a, ["background", "backgroundDark", "className", "children", "as", "padding", "margin"]);
46
+ var background = _a.background, backgroundDark = _a.backgroundDark, className = _a.className, children = _a.children, _f = _a.as, Comp = _f === void 0 ? 'div' : _f, sm = _a.sm, md = _a.md, lg = _a.lg, padding = _a.padding, margin = _a.margin, rest = __rest(_a, ["background", "backgroundDark", "className", "children", "as", "sm", "md", "lg", "padding", "margin"]);
34
47
  var hasBackgroundColor = !!background;
35
48
  var hasBackgroundDarkColor = !!backgroundDark;
36
49
  var content = hasBackgroundColor || hasBackgroundDarkColor ? (react_1.default.createElement("div", { className: "ffe-grid__row-wrapper" }, children)) : (children);
37
- return (react_1.default.createElement(Comp, __assign({ className: (0, classnames_1.default)(className, 'ffe-grid__row', (_b = {}, _b["ffe-grid__row--bg-".concat(background)] = hasBackgroundColor, _b), (_c = {},
50
+ return (react_1.default.createElement(Comp, __assign({ className: (0, classnames_1.default)(className, sizeClasses('lg', lg), sizeClasses('md', md), sizeClasses('sm', sm), 'ffe-grid__row', (_b = {}, _b["ffe-grid__row--bg-".concat(background)] = hasBackgroundColor, _b), (_c = {},
38
51
  _c["ffe-grid__row--bg-dark-".concat(backgroundDark)] = hasBackgroundDarkColor,
39
52
  _c), (_d = {}, _d["ffe-grid__row--padding-".concat(padding)] = padding, _d), (_e = {}, _e["ffe-grid__row--margin-".concat(margin)] = margin, _e)) }, rest), content));
40
53
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-grid-react",
3
- "version": "14.0.2",
3
+ "version": "14.1.1",
4
4
  "license": "MIT",
5
5
  "author": "SpareBank1",
6
6
  "files": [
@@ -18,18 +18,18 @@
18
18
  },
19
19
  "scripts": {
20
20
  "build": "ffe-buildtool tsc",
21
- "watch": "ffe-buildtool babel-watch",
21
+ "build:es": "ffe-buildtool tsc --es",
22
22
  "lint": "eslint src",
23
23
  "lint:fix": "eslint src --fix",
24
24
  "test": "ffe-buildtool jest",
25
25
  "test:watch": "ffe-buildtool jest --watch"
26
26
  },
27
27
  "dependencies": {
28
- "@sb1/ffe-grid": "^14.2.17",
28
+ "@sb1/ffe-grid": "^14.3.1",
29
29
  "classnames": "^2.3.1"
30
30
  },
31
31
  "devDependencies": {
32
- "@sb1/ffe-buildtool": "^0.6.2",
32
+ "@sb1/ffe-buildtool": "^0.6.3",
33
33
  "react": "^16.9.0",
34
34
  "react-dom": "^16.9.0"
35
35
  },
@@ -39,5 +39,5 @@
39
39
  "publishConfig": {
40
40
  "access": "public"
41
41
  },
42
- "gitHead": "9ac84c1d8650f7626876a864cc0dc73a67fa241b"
42
+ "gitHead": "f9439b117955babfcd2ea4389d38618679598e2d"
43
43
  }
package/types/Grid.d.ts CHANGED
@@ -1,7 +1,18 @@
1
1
  import React, { ElementType } from 'react';
2
- import { ComponentWithoutRefAsPropParams } from './types';
2
+ import { ComponentWithoutRefAsPropParams, Gap } from './types';
3
+ type SizeModifier = GridGapSize | Gap;
4
+ interface GridGapSize {
5
+ gap?: Gap;
6
+ }
3
7
  export type GridProps<As extends ElementType = any> = ComponentWithoutRefAsPropParams<As> & {
4
8
  /** Specify the internal gutter of the grid */
5
- gap?: 'none' | '2xs' | 'xs' | 'sm' | 'md' | 'lg';
9
+ gap?: Gap;
10
+ /** Size modifiers for small screen sizes */
11
+ sm?: SizeModifier;
12
+ /** Size modifiers for medium screen sizes */
13
+ md?: SizeModifier;
14
+ /** Size modifiers for large screen sizes */
15
+ lg?: SizeModifier;
6
16
  };
7
17
  export declare const Grid: React.FC<GridProps>;
18
+ export {};
@@ -1,5 +1,10 @@
1
1
  import React, { ElementType } from 'react';
2
2
  import { ComponentWithoutRefAsPropParams, BackgroundColor, BackgroundColorDark, Margin, Padding } from './types';
3
+ interface GridRowSize {
4
+ margin?: Margin;
5
+ padding?: Padding;
6
+ }
7
+ type SizeModifier = GridRowSize | Margin | Padding;
3
8
  export type GridRowProps<As extends ElementType = any> = ComponentWithoutRefAsPropParams<As> & {
4
9
  /** Padding in the top and bottom of the row */
5
10
  padding?: Padding;
@@ -9,5 +14,12 @@ export type GridRowProps<As extends ElementType = any> = ComponentWithoutRefAsPr
9
14
  background?: BackgroundColor;
10
15
  /** Supported dark background colors */
11
16
  backgroundDark?: BackgroundColorDark;
17
+ /** Size modifiers for small screen sizes */
18
+ sm?: SizeModifier;
19
+ /** Size modifiers for medium screen sizes */
20
+ md?: SizeModifier;
21
+ /** Size modifiers for large screen sizes */
22
+ lg?: SizeModifier;
12
23
  };
13
24
  export declare const GridRow: React.FC<GridRowProps>;
25
+ export {};
package/types/types.d.ts CHANGED
@@ -6,5 +6,6 @@ export type ComponentWithoutRefAsPropParams<As extends ElementType = any> = {
6
6
  export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
7
7
  export type Margin = '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl';
8
8
  export type Padding = '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl';
9
+ export type Gap = 'none' | '2xs' | 'xs' | 'sm' | 'md' | 'lg';
9
10
  export type BackgroundColor = 'frost-30' | 'sand' | 'sand-70' | 'sand-30' | 'syrin-70' | 'syrin-30' | 'vann' | 'vann-30' | 'fjell' | 'hvit';
10
11
  export type BackgroundColorDark = 'svart' | 'natt' | 'koksgraa';