@instructure/quiz-core 20.11.5-rc.2 → 20.11.5-rc.4

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 (35) hide show
  1. package/es/common/components/ImportModal/ImportFileSelector/index.js +71 -72
  2. package/es/common/components/ImportModal/ImportFileSelector/styles.js +27 -0
  3. package/es/common/components/ImportModal/ImportFileSelector/theme.js +4 -2
  4. package/es/common/components/shared/Card/CardContent/index.js +16 -18
  5. package/es/common/components/shared/Card/CardContent/theme.js +4 -2
  6. package/es/common/components/shared/Card/CardWrapper/index.js +13 -17
  7. package/es/common/components/shared/Card/CardWrapper/theme.js +4 -2
  8. package/es/common/components/shared/Card/index.js +7 -7
  9. package/es/reporting/components/resources/NewQuizAndItemAnalysis/ReportCard/presenter.js +1 -1
  10. package/es/reporting/components/resources/ReportCard/index.js +1 -1
  11. package/lib/common/components/ImportModal/ImportFileSelector/index.js +69 -74
  12. package/lib/common/components/ImportModal/ImportFileSelector/styles.js +35 -0
  13. package/lib/common/components/ImportModal/ImportFileSelector/theme.js +6 -3
  14. package/lib/common/components/shared/Card/CardContent/index.js +16 -21
  15. package/lib/common/components/shared/Card/CardContent/theme.js +6 -3
  16. package/lib/common/components/shared/Card/CardWrapper/index.js +13 -19
  17. package/lib/common/components/shared/Card/CardWrapper/theme.js +6 -3
  18. package/lib/common/components/shared/Card/index.js +7 -7
  19. package/lib/reporting/components/resources/NewQuizAndItemAnalysis/ReportCard/presenter.js +1 -1
  20. package/lib/reporting/components/resources/ReportCard/index.js +1 -1
  21. package/package.json +9 -9
  22. package/es/common/components/shared/CardEmotion/CardContent/index.js +0 -48
  23. package/es/common/components/shared/CardEmotion/CardContent/theme.js +0 -20
  24. package/es/common/components/shared/CardEmotion/CardWrapper/index.js +0 -48
  25. package/es/common/components/shared/CardEmotion/CardWrapper/theme.js +0 -13
  26. package/es/common/components/shared/CardEmotion/index.js +0 -28
  27. package/lib/common/components/shared/CardEmotion/CardContent/index.js +0 -67
  28. package/lib/common/components/shared/CardEmotion/CardContent/theme.js +0 -28
  29. package/lib/common/components/shared/CardEmotion/CardWrapper/index.js +0 -66
  30. package/lib/common/components/shared/CardEmotion/CardWrapper/theme.js +0 -21
  31. package/lib/common/components/shared/CardEmotion/index.js +0 -46
  32. /package/es/common/components/shared/{CardEmotion → Card}/CardContent/styles.js +0 -0
  33. /package/es/common/components/shared/{CardEmotion → Card}/CardWrapper/styles.js +0 -0
  34. /package/lib/common/components/shared/{CardEmotion → Card}/CardContent/styles.js +0 -0
  35. /package/lib/common/components/shared/{CardEmotion → Card}/CardWrapper/styles.js +0 -0
@@ -2,8 +2,6 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
6
-
7
5
  Object.defineProperty(exports, "__esModule", {
8
6
  value: true
9
7
  });
@@ -17,7 +15,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
17
15
 
18
16
  var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
19
17
 
20
- var _react = _interopRequireWildcard(require("react"));
18
+ var _react = require("react");
21
19
 
22
20
  var _propTypes = _interopRequireDefault(require("prop-types"));
23
21
 
@@ -27,7 +25,7 @@ var _uiButtons = require("@instructure/ui-buttons");
27
25
 
28
26
  var _uiGrid = require("@instructure/ui-grid");
29
27
 
30
- var _uiThemeable = require("@instructure/ui-themeable");
28
+ var _emotion = require("@instructure/emotion");
31
29
 
32
30
  var _uiIcons = require("@instructure/ui-icons");
33
31
 
@@ -35,123 +33,119 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
35
33
 
36
34
  var _FileSelector = _interopRequireDefault(require("../../../../common/components/shared/file_selector/FileSelector.js"));
37
35
 
36
+ var _styles = _interopRequireDefault(require("./styles.js"));
37
+
38
38
  var _theme = _interopRequireDefault(require("./theme.js"));
39
39
 
40
40
  var _dec, _class, _class2, _temp;
41
41
 
42
- var styles = {
43
- componentId: 'fqArL',
44
- template: function template(theme) {
45
- return "\n\n.fqArL_dVrD{color:".concat(theme.uploadIconContainerColor || 'inherit', ";font-size:").concat(theme.uploadIconContainerColorFontSize || 'inherit', ";text-align:right}\n\n[dir=ltr] .fqArL_dVrD,[dir=rtl] .fqArL_dVrD{text-align:right}\n\n.fqArL_brQK{color:").concat(theme.checkIconContainerColor || 'inherit', ";font-size:").concat(theme.checkIconContainerFontSize || 'inherit', ";text-align:right}\n\n[dir=ltr] .fqArL_brQK,[dir=rtl] .fqArL_brQK{text-align:right}\n\n.fqArL_kOWE{color:").concat(theme.smallTextColor || 'inherit', ";font-size:").concat(theme.smallTextFontSize || 'inherit', ";padding:0 ").concat(theme.smallTextPadding || 'inherit', "}\n\n.fqArL_ddCj{margin-top:").concat(theme.selectorMargin || 'inherit', "}\n\n.fqArL_cHlQ{color:").concat(theme.fileListSuccessColor || 'inherit', "}");
46
- },
47
- 'uploadIconContainer': 'fqArL_dVrD',
48
- 'checkIconContainer': 'fqArL_brQK',
49
- 'smallText': 'fqArL_kOWE',
50
- 'selector': 'fqArL_ddCj',
51
- 'fileListSuccess': 'fqArL_cHlQ'
52
- };
42
+ var _ref = (0, _emotion.jsx)(_uiIcons.IconUploadLine, null);
53
43
 
54
- var _ref3 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconUploadLine, null);
44
+ var _ref2 = (0, _emotion.jsx)(_uiIcons.IconCompleteLine, null);
55
45
 
56
- var _ref4 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCompleteLine, null);
57
-
58
- var ImportFileSelector = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
46
+ var ImportFileSelector = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
59
47
  (0, _inherits2.default)(ImportFileSelector, _Component);
60
48
 
61
49
  var _super = (0, _createSuper2.default)(ImportFileSelector);
62
50
 
63
51
  function ImportFileSelector() {
64
- var _this;
65
-
66
52
  (0, _classCallCheck2.default)(this, ImportFileSelector);
53
+ return _super.apply(this, arguments);
54
+ }
67
55
 
68
- for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
69
- args[_key] = arguments[_key];
56
+ (0, _createClass2.default)(ImportFileSelector, [{
57
+ key: "renderUploadIcon",
58
+ value: function renderUploadIcon(styles) {
59
+ return (0, _emotion.jsx)("div", {
60
+ css: this.props.styles.uploadIconContainer
61
+ }, _ref);
70
62
  }
71
-
72
- _this = _super.call.apply(_super, [this].concat(args));
73
-
74
- _this.renderFileList = function () {
75
- var fileName = _this.props.files.get(0).name;
76
-
77
- return /*#__PURE__*/_react.default.createElement("div", null, _formatMessage.default.rich('<0>{fileName}</0> <1>is ready.</1>', {
78
- 0: function _(_ref) {
79
- var children = _ref.children;
80
- return /*#__PURE__*/_react.default.createElement("span", {
81
- className: styles.fileListSuccess,
63
+ }, {
64
+ key: "renderCheckmarkIcon",
65
+ value: function renderCheckmarkIcon(styles) {
66
+ return (0, _emotion.jsx)("div", {
67
+ css: styles.checkIconContainer
68
+ }, _ref2);
69
+ }
70
+ }, {
71
+ key: "renderFileList",
72
+ value: function renderFileList(styles) {
73
+ var fileName = this.props.files.get(0).name;
74
+ return (0, _emotion.jsx)("div", null, _formatMessage.default.rich('<0>{fileName}</0> <1>is ready.</1>', {
75
+ 0: function _(_ref3) {
76
+ var children = _ref3.children;
77
+ return (0, _emotion.jsx)("span", {
78
+ css: styles.fileListSuccess,
82
79
  key: "0"
83
80
  }, children);
84
81
  },
85
- 1: function _(_ref2) {
86
- var children = _ref2.children;
87
- return /*#__PURE__*/_react.default.createElement("span", {
82
+ 1: function _(_ref4) {
83
+ var children = _ref4.children;
84
+ return (0, _emotion.jsx)("span", {
88
85
  key: "1"
89
86
  }, children);
90
87
  },
91
88
  fileName: fileName
92
89
  }));
93
- };
94
-
95
- return _this;
96
- }
97
-
98
- (0, _createClass2.default)(ImportFileSelector, [{
99
- key: "renderUploadIcon",
100
- value: function renderUploadIcon() {
101
- return /*#__PURE__*/_react.default.createElement("div", {
102
- className: styles.uploadIconContainer
103
- }, _ref3);
104
- }
105
- }, {
106
- key: "renderCheckmarkIcon",
107
- value: function renderCheckmarkIcon() {
108
- return /*#__PURE__*/_react.default.createElement("div", {
109
- className: styles.checkIconContainer
110
- }, _ref4);
111
90
  }
112
91
  }, {
113
92
  key: "renderFilePickerText",
114
- value: function renderFilePickerText() {
115
- return /*#__PURE__*/_react.default.createElement("div", null, _formatMessage.default.rich('Drag & Drop here <0>or</0> <1>Browse</1>', [function (_ref5) {
93
+ value: function renderFilePickerText(styles) {
94
+ return (0, _emotion.jsx)("div", null, _formatMessage.default.rich('Drag & Drop here <0>or</0> <1>Browse</1>', [function (_ref5) {
116
95
  var children = _ref5.children;
117
- return /*#__PURE__*/_react.default.createElement("span", {
118
- className: styles.smallText,
96
+ return (0, _emotion.jsx)("span", {
97
+ css: styles.smallText,
119
98
  key: "0"
120
99
  }, children);
121
100
  }, function (_ref6) {
122
101
  var children = _ref6.children;
123
- return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
102
+ return (0, _emotion.jsx)(_uiButtons.Button, {
124
103
  key: "1"
125
104
  }, children);
126
105
  }]));
127
106
  }
128
107
  }, {
129
- key: "renderWrapper",
130
- value: function renderWrapper(renderIcon, renderText) {
131
- return /*#__PURE__*/_react.default.createElement(_uiGrid.Grid, null, /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Row, {
108
+ key: "renderWrapperWithList",
109
+ value: function renderWrapperWithList(styles) {
110
+ return (0, _emotion.jsx)(_uiGrid.Grid, null, (0, _emotion.jsx)(_uiGrid.Grid.Row, {
111
+ vAlign: "middle"
112
+ }, (0, _emotion.jsx)(_uiGrid.Grid.Col, {
113
+ width: 3
114
+ }, this.renderCheckmarkIcon(styles)), (0, _emotion.jsx)(_uiGrid.Grid.Col, null, this.renderFileList(styles))));
115
+ }
116
+ }, {
117
+ key: "renderWrapperWithText",
118
+ value: function renderWrapperWithText(styles) {
119
+ return (0, _emotion.jsx)(_uiGrid.Grid, null, (0, _emotion.jsx)(_uiGrid.Grid.Row, {
132
120
  vAlign: "middle"
133
- }, /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Col, {
121
+ }, (0, _emotion.jsx)(_uiGrid.Grid.Col, {
134
122
  width: 3
135
- }, renderIcon()), /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Col, null, renderText())));
123
+ }, this.renderUploadIcon(styles)), (0, _emotion.jsx)(_uiGrid.Grid.Col, null, this.renderFilePickerText(styles))));
136
124
  }
137
125
  }, {
138
126
  key: "renderContent",
139
127
  value: function renderContent() {
140
- if (this.props.files && this.props.files.size) {
141
- return this.renderWrapper(this.renderCheckmarkIcon, this.renderFileList);
128
+ var files = this.props.files;
129
+
130
+ if (files && files.size) {
131
+ return this.renderWrapperWithList(this.props.styles);
142
132
  } else {
143
- return this.renderWrapper(this.renderUploadIcon, this.renderFilePickerText);
133
+ return this.renderWrapperWithText(this.props.styles);
144
134
  }
145
135
  }
146
136
  }, {
147
137
  key: "render",
148
138
  value: function render() {
149
- return /*#__PURE__*/_react.default.createElement("div", {
150
- className: styles.selector
151
- }, /*#__PURE__*/_react.default.createElement(_FileSelector.default, {
139
+ var _this$props = this.props,
140
+ styles = _this$props.styles,
141
+ receiveFile = _this$props.receiveFile,
142
+ acceptAttribute = _this$props.acceptAttribute;
143
+ return (0, _emotion.jsx)("div", {
144
+ css: styles.selector
145
+ }, (0, _emotion.jsx)(_FileSelector.default, {
152
146
  content: this.renderContent(),
153
- fileHandler: this.props.receiveFile,
154
- acceptAttribute: this.props.acceptAttribute
147
+ fileHandler: receiveFile,
148
+ acceptAttribute: acceptAttribute
155
149
  }));
156
150
  }
157
151
  }]);
@@ -160,7 +154,8 @@ var ImportFileSelector = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
160
154
  }(_react.Component), _class2.propTypes = {
161
155
  files: _reactImmutableProptypes.default.list.isRequired,
162
156
  receiveFile: _propTypes.default.func.isRequired,
163
- acceptAttribute: _propTypes.default.string.isRequired
157
+ acceptAttribute: _propTypes.default.string.isRequired,
158
+ styles: _propTypes.default.object
164
159
  }, _temp)) || _class);
165
160
  exports.ImportFileSelector = ImportFileSelector;
166
161
  var _default = ImportFileSelector;
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var generateStyle = function generateStyle(componentTheme) {
9
+ return {
10
+ uploadIconContainer: {
11
+ color: componentTheme.uploadIconContainerColor,
12
+ fontSize: componentTheme.uploadIconContainerColorFontSize,
13
+ textAlign: 'right'
14
+ },
15
+ checkIconContainer: {
16
+ color: componentTheme.checkIconContainerColor,
17
+ fontSize: componentTheme.checkIconContainerFontSize,
18
+ textAlign: 'right'
19
+ },
20
+ smallText: {
21
+ padding: "0 ".concat(componentTheme.smallTextPadding),
22
+ fontSize: componentTheme.smallTextFontSize,
23
+ color: componentTheme.smallTextColor
24
+ },
25
+ selector: {
26
+ marginTop: componentTheme.selectorMargin
27
+ },
28
+ fileListSuccess: {
29
+ color: componentTheme.fileListSuccessColor
30
+ }
31
+ };
32
+ };
33
+
34
+ var _default = generateStyle;
35
+ exports.default = _default;
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.default = generator;
6
+ exports.default = void 0;
7
7
 
8
- function generator(_ref) {
8
+ var generateComponentTheme = function generateComponentTheme(_ref) {
9
9
  var spacing = _ref.spacing,
10
10
  colors = _ref.colors,
11
11
  typography = _ref.typography;
@@ -20,4 +20,7 @@ function generator(_ref) {
20
20
  selectorMargin: spacing.xSmall,
21
21
  fileListSuccessColor: colors.shamrock
22
22
  };
23
- }
23
+ };
24
+
25
+ var _default = generateComponentTheme;
26
+ exports.default = _default;
@@ -2,13 +2,13 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
6
-
7
5
  Object.defineProperty(exports, "__esModule", {
8
6
  value: true
9
7
  });
10
8
  exports.default = exports.CardContent = void 0;
11
9
 
10
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
11
+
12
12
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
13
13
 
14
14
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -17,30 +17,21 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
17
17
 
18
18
  var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
19
19
 
20
- var _react = _interopRequireWildcard(require("react"));
20
+ var _react = require("react");
21
21
 
22
22
  var _propTypes = _interopRequireDefault(require("prop-types"));
23
23
 
24
- var _classnames = _interopRequireDefault(require("classnames"));
25
-
26
- var _omit = _interopRequireDefault(require("lodash/omit"));
27
-
28
- var _uiThemeable = require("@instructure/ui-themeable");
24
+ var _emotion = require("@instructure/emotion");
29
25
 
30
26
  var _uiView = require("@instructure/ui-view");
31
27
 
28
+ var _styles = _interopRequireDefault(require("./styles.js"));
29
+
32
30
  var _theme = _interopRequireDefault(require("./theme.js"));
33
31
 
34
32
  var _dec, _class, _class2, _temp;
35
33
 
36
- var styles = {
37
- componentId: 'fGJav',
38
- template: function template(theme) {
39
- return "\n\n.fGJav_caGd{background-color:".concat(theme.contentBackgroundColor || 'inherit', ";border:1px solid ").concat(theme.contentBorderColor || 'inherit', ";border-radius:").concat(theme.contentBorderRadius || 'inherit', ";box-shadow:").concat(theme.contentBoxShadow || 'inherit', ";margin:").concat(theme.contentMargin || 'inherit', " auto;max-width:").concat(theme.contentMaxWidth || 'inherit', ";transition:").concat(theme.contentTransitionDuration || 'inherit', " ease}\n\n@media screen and (--phoneBreakPoint){.fGJav_caGd{margin:").concat(theme.phoneContentMargin || 'inherit', " auto}}");
40
- },
41
- 'content': 'fGJav_caGd'
42
- };
43
- var CardContent = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
34
+ var CardContent = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
44
35
  (0, _inherits2.default)(CardContent, _Component);
45
36
 
46
37
  var _super = (0, _createSuper2.default)(CardContent);
@@ -53,20 +44,24 @@ var CardContent = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
53
44
  (0, _createClass2.default)(CardContent, [{
54
45
  key: "render",
55
46
  value: function render() {
56
- return /*#__PURE__*/_react.default.createElement(_uiView.View, {
47
+ return (0, _emotion.jsx)(_uiView.View, {
57
48
  as: "div"
58
- }, /*#__PURE__*/_react.default.createElement("div", Object.assign({
59
- className: (0, _classnames.default)(styles.content, this.props.className)
60
- }, (0, _omit.default)(this.props, Object.keys(CardContent.propTypes))), this.props.children));
49
+ }, (0, _emotion.jsx)("div", {
50
+ css: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.props.styles.content), this.props.customStyles),
51
+ className: this.props.className
52
+ }, this.props.children));
61
53
  }
62
54
  }]);
63
55
  CardContent.displayName = "CardContent";
64
56
  return CardContent;
65
57
  }(_react.Component), _class2.propTypes = {
66
58
  children: _propTypes.default.node.isRequired,
59
+ customStyles: _propTypes.default.object,
60
+ styles: _propTypes.default.object,
67
61
  className: _propTypes.default.string
68
62
  }, _class2.defaultProps = {
69
- className: null
63
+ customStyles: {},
64
+ className: ''
70
65
  }, _temp)) || _class);
71
66
  exports.CardContent = CardContent;
72
67
  var _default = CardContent;
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.default = generator;
6
+ exports.default = void 0;
7
7
 
8
- function generator(_ref) {
8
+ var generateComponentTheme = function generateComponentTheme(_ref) {
9
9
  var spacing = _ref.spacing,
10
10
  shadows = _ref.shadows,
11
11
  colors = _ref.colors,
@@ -22,4 +22,7 @@ function generator(_ref) {
22
22
  contentBorderColor: colors.tiara,
23
23
  contentBorderRadius: '4px'
24
24
  };
25
- }
25
+ };
26
+
27
+ var _default = generateComponentTheme;
28
+ exports.default = _default;
@@ -2,13 +2,13 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
6
-
7
5
  Object.defineProperty(exports, "__esModule", {
8
6
  value: true
9
7
  });
10
8
  exports.default = exports.CardWrapper = void 0;
11
9
 
10
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
11
+
12
12
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
13
13
 
14
14
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -17,28 +17,21 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
17
17
 
18
18
  var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
19
19
 
20
- var _react = _interopRequireWildcard(require("react"));
20
+ var _react = require("react");
21
21
 
22
22
  var _propTypes = _interopRequireDefault(require("prop-types"));
23
23
 
24
- var _classnames = _interopRequireDefault(require("classnames"));
25
-
26
- var _uiThemeable = require("@instructure/ui-themeable");
24
+ var _emotion = require("@instructure/emotion");
27
25
 
28
26
  var _uiView = require("@instructure/ui-view");
29
27
 
28
+ var _styles = _interopRequireDefault(require("./styles.js"));
29
+
30
30
  var _theme = _interopRequireDefault(require("./theme.js"));
31
31
 
32
32
  var _dec, _class, _class2, _temp;
33
33
 
34
- var styles = {
35
- componentId: 'fVYAO',
36
- template: function template(theme) {
37
- return "\n\n.fVYAO_gasz{box-sizing:border-box;min-height:100%;padding:".concat(theme.wrapperPadding || 'inherit', ";transition:").concat(theme.wrapperTransitionDuration || 'inherit', " ease}\n\n@media screen and (--phoneBreakPoint){.fVYAO_gasz{padding:").concat(theme.phoneWrapperPadding || 'inherit', " 0}}");
38
- },
39
- 'wrapper': 'fVYAO_gasz'
40
- };
41
- var CardWrapper = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
34
+ var CardWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
42
35
  (0, _inherits2.default)(CardWrapper, _Component);
43
36
 
44
37
  var _super = (0, _createSuper2.default)(CardWrapper);
@@ -51,11 +44,11 @@ var CardWrapper = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
51
44
  (0, _createClass2.default)(CardWrapper, [{
52
45
  key: "render",
53
46
  value: function render() {
54
- return /*#__PURE__*/_react.default.createElement(_uiView.View, {
47
+ return (0, _emotion.jsx)(_uiView.View, {
55
48
  as: "div",
56
49
  height: "100%"
57
- }, /*#__PURE__*/_react.default.createElement("div", {
58
- className: (0, _classnames.default)(styles.wrapper, this.props.className)
50
+ }, (0, _emotion.jsx)("div", {
51
+ css: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.props.styles.wrapper), this.props.customStyles)
59
52
  }, this.props.children));
60
53
  }
61
54
  }]);
@@ -63,9 +56,10 @@ var CardWrapper = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
63
56
  return CardWrapper;
64
57
  }(_react.Component), _class2.propTypes = {
65
58
  children: _propTypes.default.node.isRequired,
66
- className: _propTypes.default.string
59
+ customStyles: _propTypes.default.object,
60
+ styles: _propTypes.default.object
67
61
  }, _class2.defaultProps = {
68
- className: null
62
+ customStyles: {}
69
63
  }, _temp)) || _class);
70
64
  exports.CardWrapper = CardWrapper;
71
65
  var _default = CardWrapper;
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.default = generator;
6
+ exports.default = void 0;
7
7
 
8
- function generator(_ref) {
8
+ var generateComponentTheme = function generateComponentTheme(_ref) {
9
9
  var spacing = _ref.spacing,
10
10
  breakpoints = _ref.breakpoints,
11
11
  transitions = _ref.transitions;
@@ -15,4 +15,7 @@ function generator(_ref) {
15
15
  phoneBreakPoint: "max-width: ".concat(breakpoints.medium),
16
16
  phoneWrapperPadding: spacing.medium
17
17
  };
18
- }
18
+ };
19
+
20
+ var _default = generateComponentTheme;
21
+ exports.default = _default;
@@ -21,26 +21,26 @@ var _index2 = _interopRequireDefault(require("./CardWrapper/index.js"));
21
21
  function Card(_ref) {
22
22
  var children = _ref.children,
23
23
  wrapped = _ref.wrapped,
24
- wrapperClassName = _ref.wrapperClassName,
25
- props = (0, _objectWithoutProperties2.default)(_ref, ["children", "wrapped", "wrapperClassName"]);
24
+ wrapperStyles = _ref.wrapperStyles,
25
+ props = (0, _objectWithoutProperties2.default)(_ref, ["children", "wrapped", "wrapperStyles"]);
26
26
 
27
27
  var card = /*#__PURE__*/_react.default.createElement(_index.default, props, children);
28
28
 
29
29
  return wrapped ? /*#__PURE__*/_react.default.createElement(_index2.default, {
30
- className: wrapperClassName
30
+ customStyles: wrapperStyles
31
31
  }, card) : card;
32
32
  }
33
33
 
34
34
  Card.propTypes = {
35
35
  children: _propTypes.default.node.isRequired,
36
- className: _propTypes.default.string,
37
- wrapperClassName: _propTypes.default.string,
36
+ customStyles: _propTypes.default.object,
37
+ wrapperStyles: _propTypes.default.object,
38
38
  wrapped: _propTypes.default.bool
39
39
  };
40
40
  Card.defaultProps = {
41
41
  wrapped: false,
42
- className: null,
43
- wrapperClassName: null
42
+ customStyles: null,
43
+ wrapperStyles: null
44
44
  };
45
45
  var _default = Card;
46
46
  exports.default = _default;
@@ -31,7 +31,7 @@ var _uiA11yContent = require("@instructure/ui-a11y-content");
31
31
 
32
32
  var _emotion = require("@instructure/emotion");
33
33
 
34
- var _index = _interopRequireDefault(require("../../../../../common/components/shared/CardEmotion/index.js"));
34
+ var _index = _interopRequireDefault(require("../../../../../common/components/shared/Card/index.js"));
35
35
 
36
36
  var _styles = _interopRequireDefault(require("./styles.js"));
37
37
 
@@ -25,7 +25,7 @@ var _uiLink = require("@instructure/ui-link");
25
25
 
26
26
  var _emotion = require("@instructure/emotion");
27
27
 
28
- var _index = _interopRequireDefault(require("../../../../common/components/shared/CardEmotion/index.js"));
28
+ var _index = _interopRequireDefault(require("../../../../common/components/shared/Card/index.js"));
29
29
 
30
30
  var _styles = _interopRequireDefault(require("./styles.js"));
31
31
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/quiz-core",
3
- "version": "20.11.5-rc.2+da4c513cc",
3
+ "version": "20.11.5-rc.4+6cc0f0052",
4
4
  "license": "MIT",
5
5
  "description": "The Quiz React SDK by Instructure Inc.",
6
6
  "author": "Instructure, Inc. Engineering and Product Design",
@@ -44,11 +44,11 @@
44
44
  "@instructure/emotion": "^8.51.0",
45
45
  "@instructure/grading-utils": "^1.0.0",
46
46
  "@instructure/outcomes-ui": "^3.2.2",
47
- "@instructure/quiz-common": "20.11.5-rc.2+da4c513cc",
48
- "@instructure/quiz-i18n": "20.11.5-rc.2+da4c513cc",
49
- "@instructure/quiz-interactions": "20.11.5-rc.2+da4c513cc",
50
- "@instructure/quiz-number-input": "20.11.5-rc.2+da4c513cc",
51
- "@instructure/quiz-rce": "20.11.5-rc.2+da4c513cc",
47
+ "@instructure/quiz-common": "20.11.5-rc.4+6cc0f0052",
48
+ "@instructure/quiz-i18n": "20.11.5-rc.4+6cc0f0052",
49
+ "@instructure/quiz-interactions": "20.11.5-rc.4+6cc0f0052",
50
+ "@instructure/quiz-number-input": "20.11.5-rc.4+6cc0f0052",
51
+ "@instructure/quiz-rce": "20.11.5-rc.4+6cc0f0052",
52
52
  "@instructure/ui-a11y-content": "^8.51.0",
53
53
  "@instructure/ui-alerts": "^8.51.0",
54
54
  "@instructure/ui-avatar": "^8.51.0",
@@ -112,7 +112,7 @@
112
112
  "file-saver": "~2.0.5",
113
113
  "humps": "^2.0.0",
114
114
  "immutable": "^3.8.1",
115
- "instructure-validations": "20.11.5-rc.2+da4c513cc",
115
+ "instructure-validations": "20.11.5-rc.4+6cc0f0052",
116
116
  "ipaddr.js": "^1.5.4",
117
117
  "isomorphic-fetch": "^2.2.0",
118
118
  "isuuid": "^0.1.0",
@@ -163,7 +163,7 @@
163
163
  "intl": "^1.2.4",
164
164
  "jquery": "^2.2.3",
165
165
  "most-subject": "^5.3.0",
166
- "quiz-presets": "20.11.5-rc.2+da4c513cc",
166
+ "quiz-presets": "20.11.5-rc.4+6cc0f0052",
167
167
  "react": "^16.8.6",
168
168
  "react-addons-test-utils": "^15.6.2",
169
169
  "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
179
179
  "publishConfig": {
180
180
  "access": "public"
181
181
  },
182
- "gitHead": "da4c513ccef6feab44eccfd4f0f772de3fa43fec"
182
+ "gitHead": "6cc0f005223cdf6f9f3be8a74576475657c79a75"
183
183
  }
@@ -1,48 +0,0 @@
1
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
- import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
3
- import _createClass from "@babel/runtime/helpers/esm/createClass";
4
- import _inherits from "@babel/runtime/helpers/esm/inherits";
5
- import _createSuper from "@babel/runtime/helpers/esm/createSuper";
6
-
7
- var _dec, _class, _class2, _temp;
8
-
9
- /** @jsx jsx */
10
- import { Component } from 'react';
11
- import PropTypes from 'prop-types';
12
- import omit from 'lodash/omit';
13
- import { withStyle, jsx } from '@instructure/emotion';
14
- import { View } from '@instructure/ui-view';
15
- import generateStyle from "./styles.js";
16
- import generateComponentTheme from "./theme.js";
17
- export var CardContent = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
18
- _inherits(CardContent, _Component);
19
-
20
- var _super = _createSuper(CardContent);
21
-
22
- function CardContent() {
23
- _classCallCheck(this, CardContent);
24
-
25
- return _super.apply(this, arguments);
26
- }
27
-
28
- _createClass(CardContent, [{
29
- key: "render",
30
- value: function render() {
31
- return jsx(View, {
32
- as: "div"
33
- }, jsx("div", Object.assign({
34
- css: _objectSpread(_objectSpread({}, this.props.styles.content), this.props.customStyles)
35
- }, omit(this.props, Object.keys(CardContent.propTypes))), this.props.children));
36
- }
37
- }]);
38
-
39
- CardContent.displayName = "CardContent";
40
- return CardContent;
41
- }(Component), _class2.propTypes = {
42
- children: PropTypes.node.isRequired,
43
- customStyles: PropTypes.object,
44
- styles: PropTypes.object
45
- }, _class2.defaultProps = {
46
- customStyles: {}
47
- }, _temp)) || _class);
48
- export default CardContent;
@@ -1,20 +0,0 @@
1
- var generateComponentTheme = function generateComponentTheme(_ref) {
2
- var spacing = _ref.spacing,
3
- shadows = _ref.shadows,
4
- colors = _ref.colors,
5
- breakpoints = _ref.breakpoints,
6
- transitions = _ref.transitions;
7
- return {
8
- contentTransitionDuration: transitions.duration,
9
- contentBackgroundColor: colors.white,
10
- contentMaxWidth: '79.5rem',
11
- contentMargin: spacing.medium,
12
- phoneBreakPoint: "max-width: ".concat(breakpoints.medium),
13
- phoneContentMargin: spacing.xSmall,
14
- contentBoxShadow: shadows.depth1,
15
- contentBorderColor: colors.tiara,
16
- contentBorderRadius: '4px'
17
- };
18
- };
19
-
20
- export default generateComponentTheme;