@instructure/ui-view 8.11.2-snapshot.72 → 8.12.1-snapshot.19

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.
Files changed (10) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/es/View/index.js +1 -2
  3. package/es/View/styles.js +14 -10
  4. package/lib/View/index.js +1 -2
  5. package/lib/View/styles.js +14 -10
  6. package/package.json +14 -14
  7. package/src/View/index.tsx +1 -2
  8. package/src/View/styles.ts +14 -10
  9. package/types/View/index.d.ts.map +1 -1
  10. package/types/View/styles.d.ts.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,10 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [8.12.0](https://github.com/instructure/instructure-ui/compare/v8.11.1...v8.12.0) (2021-11-17)
7
+
8
+ **Note:** Version bump only for package @instructure/ui-view
9
+
6
10
  ## [8.11.1](https://github.com/instructure/instructure-ui/compare/v8.11.0...v8.11.1) (2021-10-19)
7
11
 
8
12
  **Note:** Version bump only for package @instructure/ui-view
package/es/View/index.js CHANGED
@@ -155,8 +155,7 @@ let View = (_dec = textDirectionContextConsumer(), _dec2 = withStyle(generateSty
155
155
  const ElementType = getElementType(View, this.props);
156
156
  return jsx(ElementType, Object.assign({}, passthroughProps(props), {
157
157
  className: className,
158
- css: styles === null || styles === void 0 ? void 0 : styles.view,
159
- style: styles === null || styles === void 0 ? void 0 : styles.inlineStyles,
158
+ css: [styles === null || styles === void 0 ? void 0 : styles.view, styles === null || styles === void 0 ? void 0 : styles.inlineStyles],
160
159
  ref: this.handleElementRef
161
160
  }), children);
162
161
  }
package/es/View/styles.js CHANGED
@@ -467,16 +467,20 @@ const generateStyle = (componentTheme, props) => {
467
467
  } : {}),
468
468
  ...(shouldUseFocusStyles ? focusStyles : {})
469
469
  },
470
- inlineStyles: { ...spacingStyle,
471
- ...borderStyle,
472
- ...offsetStyle,
473
- width,
474
- height,
475
- minWidth,
476
- minHeight,
477
- maxWidth,
478
- maxHeight,
479
- ...getStyleProps(props)
470
+ inlineStyles: {
471
+ //every '&' symbol will add another class to the rule, so it will be stronger
472
+ //making an accidental override less likely
473
+ '&&&&&&&&&&': { ...spacingStyle,
474
+ ...borderStyle,
475
+ ...offsetStyle,
476
+ width,
477
+ height,
478
+ minWidth,
479
+ minHeight,
480
+ maxWidth,
481
+ maxHeight,
482
+ ...getStyleProps(props)
483
+ }
480
484
  }
481
485
  };
482
486
  };
package/lib/View/index.js CHANGED
@@ -153,8 +153,7 @@ let View = (_dec = (0, _textDirectionContextConsumer.textDirectionContextConsume
153
153
  const ElementType = (0, _getElementType.getElementType)(View, this.props);
154
154
  return (0, _emotion.jsx)(ElementType, Object.assign({}, (0, _passthroughProps.passthroughProps)(props), {
155
155
  className: className,
156
- css: styles === null || styles === void 0 ? void 0 : styles.view,
157
- style: styles === null || styles === void 0 ? void 0 : styles.inlineStyles,
156
+ css: [styles === null || styles === void 0 ? void 0 : styles.view, styles === null || styles === void 0 ? void 0 : styles.inlineStyles],
158
157
  ref: this.handleElementRef
159
158
  }), children);
160
159
  }
package/lib/View/styles.js CHANGED
@@ -477,16 +477,20 @@ const generateStyle = (componentTheme, props) => {
477
477
  } : {}),
478
478
  ...(shouldUseFocusStyles ? focusStyles : {})
479
479
  },
480
- inlineStyles: { ...spacingStyle,
481
- ...borderStyle,
482
- ...offsetStyle,
483
- width,
484
- height,
485
- minWidth,
486
- minHeight,
487
- maxWidth,
488
- maxHeight,
489
- ...getStyleProps(props)
480
+ inlineStyles: {
481
+ //every '&' symbol will add another class to the rule, so it will be stronger
482
+ //making an accidental override less likely
483
+ '&&&&&&&&&&': { ...spacingStyle,
484
+ ...borderStyle,
485
+ ...offsetStyle,
486
+ width,
487
+ height,
488
+ minWidth,
489
+ minHeight,
490
+ maxWidth,
491
+ maxHeight,
492
+ ...getStyleProps(props)
493
+ }
490
494
  }
491
495
  };
492
496
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/ui-view",
3
- "version": "8.11.2-snapshot.72+1bd7a0ccd",
3
+ "version": "8.12.1-snapshot.19+63603ec19",
4
4
  "description": "A component for basic styles including spacing, sizing, borders, display, positioning, and focus states.",
5
5
  "author": "Instructure, Inc. Engineering and Product Design",
6
6
  "type": "commonjs",
@@ -25,21 +25,21 @@
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@babel/runtime": "^7.13.10",
28
- "@instructure/console": "8.11.2-snapshot.72+1bd7a0ccd",
29
- "@instructure/emotion": "8.11.2-snapshot.72+1bd7a0ccd",
30
- "@instructure/shared-types": "8.11.2-snapshot.72+1bd7a0ccd",
31
- "@instructure/ui-color-utils": "8.11.2-snapshot.72+1bd7a0ccd",
32
- "@instructure/ui-dom-utils": "8.11.2-snapshot.72+1bd7a0ccd",
33
- "@instructure/ui-i18n": "8.11.2-snapshot.72+1bd7a0ccd",
34
- "@instructure/ui-position": "8.11.2-snapshot.72+1bd7a0ccd",
35
- "@instructure/ui-prop-types": "8.11.2-snapshot.72+1bd7a0ccd",
36
- "@instructure/ui-react-utils": "8.11.2-snapshot.72+1bd7a0ccd",
28
+ "@instructure/console": "8.12.1-snapshot.19+63603ec19",
29
+ "@instructure/emotion": "8.12.1-snapshot.19+63603ec19",
30
+ "@instructure/shared-types": "8.12.1-snapshot.19+63603ec19",
31
+ "@instructure/ui-color-utils": "8.12.1-snapshot.19+63603ec19",
32
+ "@instructure/ui-dom-utils": "8.12.1-snapshot.19+63603ec19",
33
+ "@instructure/ui-i18n": "8.12.1-snapshot.19+63603ec19",
34
+ "@instructure/ui-position": "8.12.1-snapshot.19+63603ec19",
35
+ "@instructure/ui-prop-types": "8.12.1-snapshot.19+63603ec19",
36
+ "@instructure/ui-react-utils": "8.12.1-snapshot.19+63603ec19",
37
37
  "prop-types": "^15"
38
38
  },
39
39
  "devDependencies": {
40
- "@instructure/ui-babel-preset": "8.11.2-snapshot.72+1bd7a0ccd",
41
- "@instructure/ui-test-utils": "8.11.2-snapshot.72+1bd7a0ccd",
42
- "@instructure/ui-themes": "8.11.2-snapshot.72+1bd7a0ccd"
40
+ "@instructure/ui-babel-preset": "8.12.1-snapshot.19+63603ec19",
41
+ "@instructure/ui-test-utils": "8.12.1-snapshot.19+63603ec19",
42
+ "@instructure/ui-themes": "8.12.1-snapshot.19+63603ec19"
43
43
  },
44
44
  "peerDependencies": {
45
45
  "react": ">=16.8 <=17"
@@ -48,5 +48,5 @@
48
48
  "access": "public"
49
49
  },
50
50
  "sideEffects": false,
51
- "gitHead": "1bd7a0ccd746294680a432c598c44cf00ef2e39b"
51
+ "gitHead": "63603ec190cf074dfe3fc57db7a381fae9d5c333"
52
52
  }
package/src/View/index.tsx CHANGED
@@ -218,8 +218,7 @@ class View extends Component<ViewProps> {
218
218
  //@ts-expect-error TODO: `ref` prop causes: "Expression produces a union type that is too complex to represent.ts(2590)"
219
219
  {...passthroughProps(props)}
220
220
  className={className}
221
- css={styles?.view}
222
- style={styles?.inlineStyles}
221
+ css={[styles?.view, styles?.inlineStyles]}
223
222
  ref={this.handleElementRef}
224
223
  >
225
224
  {children}
package/src/View/styles.ts CHANGED
@@ -600,16 +600,20 @@ const generateStyle = (
600
600
  ...(shouldUseFocusStyles ? focusStyles : {})
601
601
  },
602
602
  inlineStyles: {
603
- ...spacingStyle,
604
- ...borderStyle,
605
- ...offsetStyle,
606
- width,
607
- height,
608
- minWidth,
609
- minHeight,
610
- maxWidth,
611
- maxHeight,
612
- ...getStyleProps(props)
603
+ //every '&' symbol will add another class to the rule, so it will be stronger
604
+ //making an accidental override less likely
605
+ '&&&&&&&&&&': {
606
+ ...spacingStyle,
607
+ ...borderStyle,
608
+ ...offsetStyle,
609
+ width,
610
+ height,
611
+ minWidth,
612
+ minHeight,
613
+ maxWidth,
614
+ maxHeight,
615
+ ...getStyleProps(props)
616
+ }
613
617
  }
614
618
  }
615
619
  }
package/types/View/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/View/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAWhD,OAAO,EAAE,GAAG,EAAa,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC;;;;;;;;GAQG;AACH,cAEM,IAAK,SAAQ,SAAS,CAAC,SAAS,CAAC;IACrC,MAAM,CAAC,WAAW,SAAS;IAC3B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;MAUT;IAgBV,MAAM,CAAC,aAAa,UACX,OAAO,MAAM,EAAE,GAAG,CAAC,aACf,cAAc,GAAG,CAAC,yBAiB9B;IAED,OAAO,CAAC,kBAAkB,CAAS;IACnC,IAAI,QAAQ,mBAMX;gBAEW,KAAK,EAAE,SAAS;IAK5B,iBAAiB;IAIjB,kBAAkB;IAoDlB,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,gBAAgB,OAAQ,OAAO,GAAG,IAAI,UAKrC;IAED,MAAM;CA2CP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/View/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAWhD,OAAO,EAAE,GAAG,EAAa,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC;;;;;;;;GAQG;AACH,cAEM,IAAK,SAAQ,SAAS,CAAC,SAAS,CAAC;IACrC,MAAM,CAAC,WAAW,SAAS;IAC3B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;MAUT;IAgBV,MAAM,CAAC,aAAa,UACX,OAAO,MAAM,EAAE,GAAG,CAAC,aACf,cAAc,GAAG,CAAC,yBAiB9B;IAED,OAAO,CAAC,kBAAkB,CAAS;IACnC,IAAI,QAAQ,mBAMX;gBAEW,KAAK,EAAE,SAAS;IAK5B,iBAAiB;IAIjB,kBAAkB;IAoDlB,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,gBAAgB,OAAQ,OAAO,GAAG,IAAI,UAKrC;IAED,MAAM;CA0CP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,CAAA"}
package/types/View/styles.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../src/View/styles.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAGV,SAAS,EACV,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AA0UnD;;;;;;;;;GASG;AACH,QAAA,MAAM,aAAa,mBACD,SAAS,SAClB,SAAS,KACf,SAyOF,CAAA;AACD,eAAe,aAAa,CAAA"}
1
+ {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../src/View/styles.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAGV,SAAS,EACV,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AA0UnD;;;;;;;;;GASG;AACH,QAAA,MAAM,aAAa,mBACD,SAAS,SAClB,SAAS,KACf,SA6OF,CAAA;AACD,eAAe,aAAa,CAAA"}