@spothero/ui 15.4.0-beta.1 → 15.5.0

package/backlog/v1/components/Table/Table.js

@@ -51,7 +51,7 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 
 var _some = _interopRequireDefault(require("lodash/some"));
 
-var _orderBy = _interopRequireDefault(require("lodash/orderBy"));
+var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -169,7 +169,7 @@ var Table = /*#__PURE__*/function (_Component) {
 
       if (sorting) {
         var sort = (0, _isFunction.default)(sorting) ? [sorting] : (0, _toConsumableArray2.default)(sorting);
-        sortedData = (0, _orderBy.default)(data, sort, sortOrder);
+        sortedData = (0, _sortBy.default)(data, sort);
       }
 
       return /*#__PURE__*/_react.default.createElement("tbody", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spothero/ui",
-  "version": "15.4.0-beta.1",
+  "version": "15.5.0",
   "description": "SpotHero's React component UI library.",
   "main": "v2/index.js",
   "repository": "https://github.com/spothero/fe-monorepo",

package/styles/v1/components/Table/Table.jsx

@@ -4,7 +4,7 @@ import isNumber from 'lodash/isNumber';
 import isObject from 'lodash/isObject';
 import map from 'lodash/map';
 import some from 'lodash/some';
-import orderBy from 'lodash/orderBy'
+import sortBy from 'lodash/sortBy';
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -248,7 +248,7 @@ export default class Table extends Component {
         if (sorting) {
             const sort = isFunction(sorting) ? [sorting] : [...sorting];
 
-            sortedData = orderBy(data, sort, sortOrder);
+            sortedData = sortBy(data, sort);
         }
 
         return (

package/styles/v2/components/Modal/styles/dialogContainer.js

@@ -3,4 +3,8 @@ export default {
     zIndex: 'layer8',
     justifyContent: 'center',
     alignItems: {base: 'flex-end', tablet: 'center'},
+    height: '100%',
+    minHeight: '-moz-available',
+    minHeight: '-webkit-fill-available',
+    minHeight: 'fill-available',
 };

package/styles/v2/components/ThemeProvider/ThemeProvider.jsx

@@ -7,9 +7,18 @@ import {Fonts, LegacyOverrides} from 'v2/theme/global';
 import merge from 'lodash/merge';
 
 const ThemeProvider = forwardRef(
-    ({theme, useLegacyOverrides, children, ...props}, ref) => (
+    (
+        {
+            theme,
+            useLegacyOverrides,
+            disableExternalFonts = false,
+            children,
+            ...props
+        },
+        ref
+    ) => (
         <ChakraProvider {...props} ref={ref} theme={merge(THEME, theme)}>
-            <Fonts />
+            {disableExternalFonts ? null : <Fonts />}
             <LegacyOverrides useLegacyOverrides={useLegacyOverrides} />
             {children}
         </ChakraProvider>
@@ -19,6 +28,8 @@ const ThemeProvider = forwardRef(
 ThemeProvider.propTypes = {
     /** If true, this will use the old `spothero-html` base styles */
     useLegacyOverrides: PropTypes.bool,
+    /** If true, this will not load the `Fonts` global styles */
+    disableExternalFonts: PropTypes.bool,
     /** The React node (generally your entire App) that will be provided the theme */
     children: PropTypes.node,
     /** Adds additional themeing on top of SpotHero's default configuration */

package/styles/v2/components/ThemeProvider/ThemeProvider.stories.js

@@ -64,6 +64,12 @@ const Template = (props, {hasDarkBackground}) => {
                 a boolean. If true, the ThemeProvider will insert the typography
                 styling from .spothero-html
             </Text>{' '}
+            <Text mb={8} color={contentTextColor}>
+                ThemeProvider also has a <Code>disableExternalFonts</Code> prop
+                that is a boolean. If true, the ThemeProvider will not load the
+                font files from Google's CDN, and you will be able to handle
+                fonts on a project-level.
+            </Text>{' '}
         </Box>
     );
 };

package/styles/v2/theme/base/typography.js

@@ -1,6 +1,6 @@
 export const fonts = {
-    heading: `'Open Sans', sans-serif`,
-    body: `'Open Sans', sans-serif`,
+    heading: `"Open Sans", sans-serif`,
+    body: `"Open Sans", sans-serif`,
 };
 
 export const fontSizes = {

package/styles/v2/theme/global.js

@@ -23,12 +23,14 @@ export default global;
 export const Fonts = () => (
     <Global
         styles={`
+            @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600;700&display=swap');
+            /* Copied from https://fonts.googleapis.com/css2?family=Open+Sans:wght@700&display=swap */
             /* latin-ext */
             @font-face {
                 font-family: 'Open Sans';
                 font-style: normal;
                 font-weight: 700;
-                src: url(./fonts/OpenSans-Bold.ttf) format('ttf');
+                src: url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UN7rgOXOhpKKSTj5PW.woff2) format('woff2');
                 unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
             }
             /* latin-ext */
@@ -36,7 +38,7 @@ export const Fonts = () => (
                 font-family: 'Open Sans';
                 font-style: normal;
                 font-weight: 600;
-                src: url(./fonts/OpenSans-SemiBold.ttf) format('ttf');
+                src: url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UNirkOXOhpKKSTj5PW.woff2) format('woff2');
                 unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
             }
             /* latin-ext */
@@ -44,7 +46,7 @@ export const Fonts = () => (
                 font-family: 'Open Sans';
                 font-style: normal;
                 font-weight: 400;
-                src: url(./fonts/OpenSans-Regular.ttf) format('ttf');
+                src: url(https://fonts.gstatic.com/s/opensans/v18/mem8YaGs126MiZpBA-UFW50bf8pkAp6a.woff2) format('woff2');
                 unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
             }
             /* latin-ext */
@@ -52,7 +54,7 @@ export const Fonts = () => (
                 font-family: 'Open Sans';
                 font-style: normal;
                 font-weight: 300;
-                src: url(./fonts/OpenSans-Light.ttf) format('ttf');
+                src: url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UN_r8OXOhpKKSTj5PW.woff2) format('woff2');
                 unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
             }
         `}