dibk-design 2.1.5 → 2.1.7

package/dist/components/DragAndDropFileInput.js

@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Button = _interopRequireDefault(require("./Button"));
 var _ErrorMessage = _interopRequireDefault(require("./ErrorMessage"));
+var _Label = _interopRequireDefault(require("./Label"));
 var _DragAndDropFileInputModule = _interopRequireDefault(require("./DragAndDropFileInput.module.scss"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -82,11 +83,11 @@ var DragAndDropFileInput = function DragAndDropFileInput(props) {
   }, [props]);
   return _react.default.createElement("div", {
     className: _DragAndDropFileInputModule.default.dragAndDropFileInput
-  }, _react.default.createElement("label", {
+  }, _react.default.createElement(_Label.default, {
     htmlFor: props.id
   }, props.label, props.required && _react.default.createElement("span", {
     className: _DragAndDropFileInputModule.default.requiredSymbol
-  }, "*"), !props.contentOnly ? _react.default.createElement("div", {
+  }, "*")), _react.default.createElement("div", null, props.children), !props.contentOnly ? _react.default.createElement("div", {
     ref: containerElementRef,
     className: "".concat(_DragAndDropFileInputModule.default.dragAndDropContainer, " ").concat(highlight ? _DragAndDropFileInputModule.default.highlighted : "")
   }, props.selectedFileName ? _react.default.createElement("div", null, _react.default.createElement("span", null, _react.default.createElement("b", null, "Valgt fil:"), " ", props.selectedFileName)) : _react.default.createElement("div", null, "Slipp fil her"), _react.default.createElement("input", _extends({}, inputElementProps, {
@@ -102,7 +103,7 @@ var DragAndDropFileInput = function DragAndDropFileInput(props) {
     },
     content: buttonContent,
     hasErrors: props.hasErrors
-  })) : null) : null), props.contentOnly ? _react.default.createElement("span", null, renderValueAsText(props.selectedFileName, props.defaultContent)) : "", _react.default.createElement(_ErrorMessage.default, {
+  })) : null) : null, props.contentOnly ? _react.default.createElement("span", null, renderValueAsText(props.selectedFileName, props.defaultContent)) : "", _react.default.createElement(_ErrorMessage.default, {
     id: getErrorElementId(),
     content: props.errorMessage,
     theme: props.theme

package/dist/components/DragAndDropFileInput.module.scss

@@ -1,20 +1,10 @@
 @import "../style/global.scss";
 
 .dragAndDropFileInput {
-    label {
-        cursor: pointer;
-        font-size: 18px;
-        margin: 0 0 4px;
-        font-family: $default-font;
-        line-height: 1.3;
-        font-weight: bold;
-        font-style: normal;
-        display: block;
-        .requiredSymbol {
-            color: $color-error;
-            font-size: 0.8em;
-            vertical-align: top;
-        }
+    .requiredSymbol {
+        color: $color-error;
+        font-size: 0.8em;
+        vertical-align: top;
     }
 
     .dragAndDropContainer {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dibk-design",
-    "version": "2.1.5",
+    "version": "2.1.7",
     "private": false,
     "main": "dist/index.js",
     "module": "dist/index.js",