@govuk-react/label-text - npm Package Compare versions

Comparing version 0.6.0-alpha.4 to 0.6.0-rc.1

es/index.js

@@ -1,22 +0,15 @@
-var _styled;
-
 import styled from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { BLACK } from 'govuk-colours';
-import { withWhiteSpace } from '@govuk-react/hoc';
-import { FONT_SIZE, LINE_HEIGHT, MEDIA_QUERIES, NTA_LIGHT } from '@govuk-react/constants';
-var StyledLabelText = styled('span')((_styled = {
-  fontFamily: NTA_LIGHT,
-  WebkitFontSmoothing: 'antialiased',
-  MozOsxFontSmoothing: 'grayscale',
+import { spacing, typography } from '@govuk-react/lib'; // TODO should `LabelText` and `Label` be consolidated?
+// TODO add support for differing font sizes, as per govuk-frontend - see:
+// https://github.com/alphagov/govuk-frontend/blob/master/src/components/label/_label.scss
+
+var StyledLabelText = styled('span')(typography.font({
+  size: 19
+}), typography.textColour, {
   display: 'block',
   clear: 'none',
-  fontWeight: 400,
-  fontSize: FONT_SIZE.SIZE_16,
-  lineHeight: LINE_HEIGHT.SIZE_16
-}, _styled[MEDIA_QUERIES.LARGESCREEN] = {
-  fontSize: FONT_SIZE.SIZE_19,
-  lineHeight: LINE_HEIGHT.SIZE_19
-}, _styled.color = "" + BLACK, _styled.paddingBottom = '2px', _styled), function (_ref) {
+  paddingBottom: '2px'
+}, function (_ref) {
   var error = _ref.error;
@@ -26,3 +19,5 @@ return {
   };
-});
+}, spacing.withWhiteSpace({
+  marginBottom: 0
+}));
 /**
@@ -46,5 +41,3 @@ *
 
-export default withWhiteSpace({
-  marginBottom: 0
-})(LabelText);
+export default LabelText;
 //# sourceMappingURL=index.js.map

lib/index.js

@@ -12,25 +12,16 @@ "use strict";
 
-var _govukColours = require("govuk-colours");
+var _lib = require("@govuk-react/lib");
 
-var _hoc = require("@govuk-react/hoc");
-
-var _constants = require("@govuk-react/constants");
-
-var _styled;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var StyledLabelText = (0, _styledComponents.default)('span')((_styled = {
-  fontFamily: _constants.NTA_LIGHT,
-  WebkitFontSmoothing: 'antialiased',
-  MozOsxFontSmoothing: 'grayscale',
+// TODO should `LabelText` and `Label` be consolidated?
+// TODO add support for differing font sizes, as per govuk-frontend - see:
+// https://github.com/alphagov/govuk-frontend/blob/master/src/components/label/_label.scss
+var StyledLabelText = (0, _styledComponents.default)('span')(_lib.typography.font({
+  size: 19
+}), _lib.typography.textColour, {
   display: 'block',
   clear: 'none',
-  fontWeight: 400,
-  fontSize: _constants.FONT_SIZE.SIZE_16,
-  lineHeight: _constants.LINE_HEIGHT.SIZE_16
-}, _styled[_constants.MEDIA_QUERIES.LARGESCREEN] = {
-  fontSize: _constants.FONT_SIZE.SIZE_19,
-  lineHeight: _constants.LINE_HEIGHT.SIZE_19
-}, _styled.color = "" + _govukColours.BLACK, _styled.paddingBottom = '2px', _styled), function (_ref) {
+  paddingBottom: '2px'
+}, function (_ref) {
   var error = _ref.error;
@@ -40,3 +31,5 @@ return {
   };
-});
+}, _lib.spacing.withWhiteSpace({
+  marginBottom: 0
+}));
 /**
@@ -60,8 +53,5 @@ *
 
-var _default = (0, _hoc.withWhiteSpace)({
-  marginBottom: 0
-})(LabelText);
-
+var _default = LabelText;
 exports.default = _default;
 module.exports = exports.default;
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@govuk-react/label-text",
-  "version": "0.6.0-alpha.4",
+  "version": "0.6.0-rc.1",
   "dependencies": {
-    "@govuk-react/constants": "^0.6.0-alpha.4",
-    "@govuk-react/hoc": "^0.6.0-alpha.4",
-    "govuk-colours": "^1.0.3"
+    "@govuk-react/lib": "^0.6.0-rc.1"
   },
@@ -9,0 +7,0 @@ "peerDependencies": {

src/index.js

 import styled from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { BLACK } from 'govuk-colours';
-import { withWhiteSpace } from '@govuk-react/hoc';
-import {
-  FONT_SIZE,
-  LINE_HEIGHT,
-  MEDIA_QUERIES,
-  NTA_LIGHT,
-} from '@govuk-react/constants';
+import { spacing, typography } from '@govuk-react/lib';
 
+// TODO should `LabelText` and `Label` be consolidated?
+// TODO add support for differing font sizes, as per govuk-frontend - see:
+// https://github.com/alphagov/govuk-frontend/blob/master/src/components/label/_label.scss
+
 const StyledLabelText = styled('span')(
+  typography.font({ size: 19 }),
+  typography.textColour,
   {
-    fontFamily: NTA_LIGHT,
-    WebkitFontSmoothing: 'antialiased',
-    MozOsxFontSmoothing: 'grayscale',
     display: 'block',
     clear: 'none',
-    fontWeight: 400,
-    fontSize: FONT_SIZE.SIZE_16,
-    lineHeight: LINE_HEIGHT.SIZE_16,
-    [MEDIA_QUERIES.LARGESCREEN]: {
-      fontSize: FONT_SIZE.SIZE_19,
-      lineHeight: LINE_HEIGHT.SIZE_19,
-    },
-    color: `${BLACK}`,
     paddingBottom: '2px',
@@ -33,2 +21,3 @@ },
   }),
+  spacing.withWhiteSpace({ marginBottom: 0 }),
 );
@@ -56,2 +45,2 @@
 
-export default withWhiteSpace({ marginBottom: 0 })(LabelText);
+export default LabelText;

No alert changes

Improved metrics

Dependency count

3

decreased by-40%

Worsened metrics

Total package byte prevSize

23671

decreased by-13.28%

Lines of code

242

decreased by-9.36%

Dependency changes

• + Added@govuk-react/lib@^0.6.0-rc.1

• - Removed@govuk-react/constants@^0.6.0-alpha.4

• - Removed@govuk-react/hoc@^0.6.0-alpha.4

• - Removedgovuk-colours@^1.0.3

• - Removed@govuk-react/hoc@0.6.0(transitive)

• - Removed@govuk-react/icons@0.6.0(transitive)

• - Removed@govuk-react/link@0.6.0(transitive)