@expo/styleguide 8.0.0-alpha.2 → 8.0.0-alpha.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.
package/README.md CHANGED
@@ -11,21 +11,19 @@ Expo's styleguide and components for use on the web.
11
11
  2. Import global CSS files from the package in your JS(X)/TS(X) code:
12
12
  ```jsx
13
13
  import "@expo/styleguide/dist/expo-theme.css";
14
- import "@expo/styleguide/dist/global.css";
15
14
  ```
16
15
  or import it the main stylesheet file:
17
16
  ```css
18
17
  @import "@expo/styleguide/dist/expo-theme.css";
19
- @import "@expo/styleguide/dist/global.css";
20
18
  ```
21
19
 
22
20
  ### Tailwind theme
23
21
 
24
22
  For the Styleguide we use our custom Tailwind theme, which is based on the default TW theme, with the following differences:
25
- * only valid media screen scopes are: `small:`, `medium:` and `large:`
23
+ * only valid media screen scopes are: `xs:`, `sm:`, `md:`, `lg:` and `xl:`
26
24
  * there is a custom `hocus:` scope which is a shorthand for hover and focus states
27
25
  * typography elements are predefined as a `heading-[size]` styles sets
28
- * `icon-[size]` are custom classes defined for icons sizing
26
+ * `icon-[size]` are custom component classes defined for icons sizing
29
27
 
30
28
  ## Development
31
29
 
package/dist/index.d.ts CHANGED
@@ -3,3 +3,4 @@ export * from './src/logos';
3
3
  export { shadows } from './src/styles/shadows';
4
4
  export { theme } from './src/styles/themes';
5
5
  export { typography } from './src/styles/typography';
6
+ export { mergeClasses } from './src/helpers/mergeClasses';
package/dist/index.js CHANGED
@@ -204,9 +204,15 @@ function __rest(s, e) {
204
204
  return t;
205
205
  }
206
206
 
207
+ var mergeClasses = tailwindMerge.extendTailwindMerge({
208
+ classGroups: {
209
+ icon: [{ icon: ['xs', 'sm', 'md', 'lg', 'xl', '2xl'] }]
210
+ }
211
+ });
212
+
207
213
  var ButtonBase = React.forwardRef(function (_a, ref) {
208
214
  var children = _a.children, testID = _a.testID, className = _a.className, onClick = _a.onClick, _b = _a.type, type = _b === void 0 ? 'button' : _b, _c = _a.disabled, disabled = _c === void 0 ? false : _c, rest = __rest(_a, ["children", "testID", "className", "onClick", "type", "disabled"]);
209
- return (React.createElement("button", __assign({ className: tailwindMerge.twMerge('flex cursor-pointer', className), "data-testid": testID, disabled: disabled, ref: ref, type: type, onClick: disabled ? undefined : onClick }, rest), children));
215
+ return (React.createElement("button", __assign({ className: mergeClasses('flex cursor-pointer', className), "data-testid": testID, disabled: disabled, ref: ref, type: type, onClick: disabled ? undefined : onClick }, rest), children));
210
216
  });
211
217
 
212
218
  var STOPWORDS = 'a an and at but by for in nor of on or so the to up yet'.split(' ');
@@ -250,7 +256,7 @@ var LinkBase = React.forwardRef(function (_a, ref) {
250
256
 
251
257
  function Link(_a) {
252
258
  var className = _a.className, disabled = _a.disabled, rest = __rest(_a, ["className", "disabled"]);
253
- return (React.createElement(LinkBase, __assign({ className: tailwindMerge.twMerge('text-link transition-opacity', !disabled && 'hocus:opacity-80', className) }, rest)));
259
+ return (React.createElement(LinkBase, __assign({ className: mergeClasses('text-link transition-opacity', !disabled && 'hocus:opacity-80', className) }, rest)));
254
260
  }
255
261
 
256
262
  function getSizeClasses(size) {
@@ -273,19 +279,19 @@ function getThemeClasses(theme, disabled) {
273
279
  if (disabled === void 0) { disabled = false; }
274
280
  switch (theme) {
275
281
  case 'primary':
276
- return tailwindMerge.twMerge('border-button-primary bg-button-primary text-button-primary shadow-xs', !disabled && 'hocus:bg-button-primary-hover active:scale-98', disabled && 'bg-button-primary-disabled border-button-primary-disabled text-button-primary-disabled');
282
+ return mergeClasses('border-button-primary bg-button-primary text-button-primary shadow-xs', !disabled && 'hocus:bg-button-primary-hover active:scale-98', disabled && 'bg-button-primary-disabled border-button-primary-disabled text-button-primary-disabled');
277
283
  case 'primary-destructive':
278
- return tailwindMerge.twMerge('border-button-primary-destructive bg-button-primary-destructive text-button-primary-destructive shadow-xs', !disabled && 'hocus:bg-button-primary-destructive-hover active:scale-98', disabled &&
284
+ return mergeClasses('border-button-primary-destructive bg-button-primary-destructive text-button-primary-destructive shadow-xs', !disabled && 'hocus:bg-button-primary-destructive-hover active:scale-98', disabled &&
279
285
  'bg-button-primary-destructive-disabled border-button-primary-destructive-disabled text-button-primary-destructive-disabled');
280
286
  case 'secondary':
281
- return tailwindMerge.twMerge('border-button-secondary bg-button-secondary text-button-secondary shadow-xs', !disabled && 'hocus:bg-button-secondary-hover active:scale-98', disabled && 'bg-button-secondary-disabled border-button-secondary-disabled text-button-secondary-disabled');
287
+ return mergeClasses('border-button-secondary bg-button-secondary text-button-secondary shadow-xs', !disabled && 'hocus:bg-button-secondary-hover active:scale-98', disabled && 'bg-button-secondary-disabled border-button-secondary-disabled text-button-secondary-disabled');
282
288
  case 'secondary-destructive':
283
- return tailwindMerge.twMerge('border-button-secondary-destructive bg-button-secondary-destructive text-button-secondary-destructive shadow-xs', !disabled && 'hocus:bg-button-secondary-destructive-hover active:scale-98', disabled &&
289
+ return mergeClasses('border-button-secondary-destructive bg-button-secondary-destructive text-button-secondary-destructive shadow-xs', !disabled && 'hocus:bg-button-secondary-destructive-hover active:scale-98', disabled &&
284
290
  'bg-button-secondary-destructive-disabled border-button-secondary-destructive-disabled text-button-secondary-destructive-disabled');
285
291
  case 'tertiary':
286
- return tailwindMerge.twMerge('border-button-tertiary bg-button-tertiary text-button-tertiary shadow-none', !disabled && 'hocus:bg-button-tertiary-hover active:scale-98', disabled && 'bg-button-tertiary-disabled border-button-tertiary-disabled text-button-tertiary-disabled');
292
+ return mergeClasses('border-button-tertiary bg-button-tertiary text-button-tertiary shadow-none', !disabled && 'hocus:bg-button-tertiary-hover active:scale-98', disabled && 'bg-button-tertiary-disabled border-button-tertiary-disabled text-button-tertiary-disabled');
287
293
  case 'quaternary':
288
- return tailwindMerge.twMerge('border-button-quaternary bg-button-quaternary text-button-quaternary shadow-none', !disabled && 'hocus:bg-button-quaternary-hover active:scale-98', disabled && 'bg-button-quaternary-disabled border-button-quaternary-disabled text-button-quaternary-disabled');
294
+ return mergeClasses('border-button-quaternary bg-button-quaternary text-button-quaternary shadow-none', !disabled && 'hocus:bg-button-quaternary-hover active:scale-98', disabled && 'bg-button-quaternary-disabled border-button-quaternary-disabled text-button-quaternary-disabled');
289
295
  }
290
296
  }
291
297
  function getIconSizeClasses(size) {
@@ -329,7 +335,7 @@ function isIconElement(element) {
329
335
  return false;
330
336
  }
331
337
  function getIconProps(element, classNames) {
332
- return __assign(__assign({}, element.props), { className: tailwindMerge.twMerge(classNames, element.props.className) });
338
+ return __assign(__assign({}, element.props), { className: mergeClasses(classNames, element.props.className) });
333
339
  }
334
340
  var Button = function (props) {
335
341
  var children = props.children, _a = props.size, size = _a === void 0 ? 'sm' : _a, _b = props.theme, theme = _b === void 0 ? 'primary' : _b, href = props.href, disabled = props.disabled, className = props.className, leftSlot = props.leftSlot, rightSlot = props.rightSlot, openInNewTab = props.openInNewTab, rest = __rest(props, ["children", "size", "theme", "href", "disabled", "className", "leftSlot", "rightSlot", "openInNewTab"]);
@@ -337,48 +343,48 @@ var Button = function (props) {
337
343
  var isLeftSlotIcon = leftSlot && isIconElement(leftSlot);
338
344
  var isRightSlotIcon = rightSlot && isIconElement(rightSlot);
339
345
  var iconClasses = (isLeftSlotIcon || isRightSlotIcon) &&
340
- tailwindMerge.twMerge("".concat(getIconSizeClasses(size)), getThemedIconClasses(theme), disabled && 'opacity-60');
341
- return (React.createElement(Element, __assign({ href: href, className: tailwindMerge.twMerge("inline-flex border rounded-md font-medium gap-2 items-center whitespace-nowrap transition", getSizeClasses(size), getThemeClasses(theme, disabled), disabled && 'cursor-default opacity-80 pointer-event-none', className), disabled: disabled }, (href ? { openInNewTab: openInNewTab } : {}), rest),
346
+ mergeClasses("".concat(getIconSizeClasses(size)), getThemedIconClasses(theme), disabled && 'opacity-60');
347
+ return (React.createElement(Element, __assign({ href: href, className: mergeClasses("inline-flex border border-solid rounded-md font-medium gap-2 items-center whitespace-nowrap transition", getSizeClasses(size), getThemeClasses(theme, disabled), disabled && 'cursor-default opacity-80 pointer-event-none', className), disabled: disabled }, (href ? { openInNewTab: openInNewTab } : {}), rest),
342
348
  isLeftSlotIcon ? React.cloneElement(leftSlot, getIconProps(leftSlot, iconClasses)) : leftSlot,
343
- children && (React.createElement("span", { className: tailwindMerge.twMerge('flex self-center text-inherit leading-none', href && 'select-none') }, typeof children === 'string' ? titleCase(children) : children)),
349
+ children && (React.createElement("span", { className: mergeClasses('flex self-center text-inherit leading-none', href && 'select-none') }, typeof children === 'string' ? titleCase(children) : children)),
344
350
  isRightSlotIcon ? React.cloneElement(rightSlot, getIconProps(rightSlot, iconClasses)) : rightSlot));
345
351
  };
346
352
 
347
- function DocsLogo(props) {
348
- var _a = props.title, title = _a === void 0 ? 'Docs-logo' : _a, color = props.color, titleId = props.titleId;
349
- return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", "aria-labelledby": titleId }, props),
350
- title ? React.createElement("title", { id: titleId }, title) : null,
351
- React.createElement("path", { d: "M12.07 8a.157.157 0 01.166.015l5.374 4.141a.16.16 0 01.055.168l-.37 1.298a.157.157 0 01-.234.09l-4.416-2.768-.846 5.47a.157.157 0 01-.219.12l-1.158-.518a.157.157 0 01-.093-.154l.477-7.132a.157.157 0 01.085-.129L12.069 8z", fill: color || 'var(--expo-theme-icon-default)' }),
352
- React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M9.584.02a.157.157 0 00-.157.001L.708 5.071l-.003.001a.157.157 0 00-.079.135V15.31c0 .056.03.108.079.136l1.71.984.004.003a.157.157 0 00.157 0l1.054-.61v1.183c0 .056.03.108.078.136l1.715.987a.157.157 0 00.156 0l.003-.002 2.024-1.172.91 2.934a.157.157 0 00.198.102l1.815-.594a.156.156 0 00.03-.013l8.732-4.666a.157.157 0 00.075-.186L16.06 4.258a.157.157 0 00-.205-.098l-1.473.529v-1.85a.157.157 0 00-.079-.135l-.002-.001-1.713-.986a.157.157 0 00-.156 0l-1.054.61V1.144a.157.157 0 00-.078-.136L9.584.02zM5.33 9.56l-.003-1.578-1.383-.805v9.74l1.4.806-.014-8.119a.156.156 0 010-.045zM.94 5.48l1.384.805.017 9.741-1.4-.806V5.48zm9.968-4.336l-1.4-.806-8.412 4.87 1.385.806 8.427-4.87zM5.483 7.71l8.427-4.87-1.4-.806-8.411 4.87 1.384.806zm5.09 11.313l-3.21-9.971 8.455-4.519 3.21 9.97-8.456 4.52zM5.678 9.678l3.09 9.967 1.514-.496-3.21-9.972-1.394.501z", fill: color || 'var(--expo-theme-icon-default)' })));
353
+ function DocsLogo(_a) {
354
+ var className = _a.className, rest = __rest(_a, ["className"]);
355
+ var _className = mergeClasses('icon-md text-icon-default', className);
356
+ return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", className: _className }, rest),
357
+ React.createElement("path", { d: "M12.07 8a.157.157 0 01.166.015l5.374 4.141a.16.16 0 01.055.168l-.37 1.298a.157.157 0 01-.234.09l-4.416-2.768-.846 5.47a.157.157 0 01-.219.12l-1.158-.518a.157.157 0 01-.093-.154l.477-7.132a.157.157 0 01.085-.129L12.069 8z", fill: "currentColor" }),
358
+ React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M9.584.02a.157.157 0 00-.157.001L.708 5.071l-.003.001a.157.157 0 00-.079.135V15.31c0 .056.03.108.079.136l1.71.984.004.003a.157.157 0 00.157 0l1.054-.61v1.183c0 .056.03.108.078.136l1.715.987a.157.157 0 00.156 0l.003-.002 2.024-1.172.91 2.934a.157.157 0 00.198.102l1.815-.594a.156.156 0 00.03-.013l8.732-4.666a.157.157 0 00.075-.186L16.06 4.258a.157.157 0 00-.205-.098l-1.473.529v-1.85a.157.157 0 00-.079-.135l-.002-.001-1.713-.986a.157.157 0 00-.156 0l-1.054.61V1.144a.157.157 0 00-.078-.136L9.584.02zM5.33 9.56l-.003-1.578-1.383-.805v9.74l1.4.806-.014-8.119a.156.156 0 010-.045zM.94 5.48l1.384.805.017 9.741-1.4-.806V5.48zm9.968-4.336l-1.4-.806-8.412 4.87 1.385.806 8.427-4.87zM5.483 7.71l8.427-4.87-1.4-.806-8.411 4.87 1.384.806zm5.09 11.313l-3.21-9.971 8.455-4.519 3.21 9.97-8.456 4.52zM5.678 9.678l3.09 9.967 1.514-.496-3.21-9.972-1.394.501z", fill: "currentColor" })));
353
359
  }
354
360
 
355
- function ExpoGoLogo(props) {
356
- var _a = props.title, title = _a === void 0 ? 'Expo-go-logo' : _a, color = props.color, titleId = props.titleId;
357
- return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", "aria-labelledby": titleId }, props),
358
- title ? React.createElement("title", { id: titleId }, title) : null,
359
- React.createElement("path", { d: "M18.072 7.75a1.749 1.749 0 00-1.56-.732 1.763 1.763 0 00-1.436.946 1.55 1.55 0 00.302 1.75 2.57 2.57 0 001.716-.484 2.53 2.53 0 00.978-1.48zM12.866 1L11.751.394 6.897 3.072l.387.207.736.383 1.332-.733L12.867.987 12.866 1zm.449-.184a.173.173 0 01.124.115l1.626 4.755a.158.158 0 01-.077.207 3.126 3.126 0 00-1.384 1.519 3.09 3.09 0 00-.134 2.042 3.29 3.29 0 001.35 1.793 3.343 3.343 0 002.195.524.208.208 0 01.202.123l1.68 4.88a.196.196 0 01-.078.215l-5.163 2.992a.195.195 0 01-.078.015.208.208 0 01-.14-.022l-1.81-1.129a.18.18 0 01-.078-.076l-3.538-8.065-5.388 3.039a.25.25 0 01-.21.008l-1.224-.69a.177.177 0 01-.077-.23l5.234-9.847c.02-.033.05-.06.085-.076L11.65.023a.2.2 0 01.186 0l1.479.793zM6.843 3.46l-.256-.13-5.044 9.523.92.514 4.352-5.643a.212.212 0 01.178-.077.217.217 0 01.155.115l4.738 10.82 1.266.775L8.066 4.62l-.216-.614-1.014-.552.007.007zm7.804 5.679a1.932 1.932 0 01.092-1.28c.176-.404.484-.737.875-.945a2.152 2.152 0 012.509.307 1.934 1.934 0 01.056 2.745l-.056.056a2.118 2.118 0 01-1.986.516 2.118 2.118 0 01-.928-.508 2.091 2.091 0 01-.562-.891z", fill: color || 'var(--expo-theme-icon-default)' })));
361
+ function ExpoGoLogo(_a) {
362
+ var className = _a.className, rest = __rest(_a, ["className"]);
363
+ var _className = mergeClasses('icon-md text-icon-default', className);
364
+ return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", className: _className }, rest),
365
+ React.createElement("path", { d: "M18.072 7.75a1.749 1.749 0 00-1.56-.732 1.763 1.763 0 00-1.436.946 1.55 1.55 0 00.302 1.75 2.57 2.57 0 001.716-.484 2.53 2.53 0 00.978-1.48zM12.866 1L11.751.394 6.897 3.072l.387.207.736.383 1.332-.733L12.867.987 12.866 1zm.449-.184a.173.173 0 01.124.115l1.626 4.755a.158.158 0 01-.077.207 3.126 3.126 0 00-1.384 1.519 3.09 3.09 0 00-.134 2.042 3.29 3.29 0 001.35 1.793 3.343 3.343 0 002.195.524.208.208 0 01.202.123l1.68 4.88a.196.196 0 01-.078.215l-5.163 2.992a.195.195 0 01-.078.015.208.208 0 01-.14-.022l-1.81-1.129a.18.18 0 01-.078-.076l-3.538-8.065-5.388 3.039a.25.25 0 01-.21.008l-1.224-.69a.177.177 0 01-.077-.23l5.234-9.847c.02-.033.05-.06.085-.076L11.65.023a.2.2 0 01.186 0l1.479.793zM6.843 3.46l-.256-.13-5.044 9.523.92.514 4.352-5.643a.212.212 0 01.178-.077.217.217 0 01.155.115l4.738 10.82 1.266.775L8.066 4.62l-.216-.614-1.014-.552.007.007zm7.804 5.679a1.932 1.932 0 01.092-1.28c.176-.404.484-.737.875-.945a2.152 2.152 0 012.509.307 1.934 1.934 0 01.056 2.745l-.056.056a2.118 2.118 0 01-1.986.516 2.118 2.118 0 01-.928-.508 2.091 2.091 0 01-.562-.891z", fill: "currentColor" })));
360
366
  }
361
367
 
362
- function Logo(props) {
363
- var _a = props.title, title = _a === void 0 ? 'Logo' : _a, color = props.color, titleId = props.titleId;
364
- return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", "aria-labelledby": titleId }, props),
365
- title ? React.createElement("title", { id: titleId }, title) : null,
366
- React.createElement("path", { d: "M9.477 7.638c.164-.24.343-.27.488-.27.145 0 .387.03.551.27 2.13 2.901 6.55 10.56 6.959 10.976.605.618 1.436.233 1.918-.468.475-.69.607-1.174.607-1.69 0-.352-6.883-13.05-7.576-14.106-.667-1.017-.884-1.274-2.025-1.274h-.854c-1.138 0-1.302.257-1.969 1.274C6.883 3.406 0 16.104 0 16.456c0 .517.132 1 .607 1.69.482.7 1.313 1.086 1.918.468.41-.417 4.822-8.075 6.952-10.977z", fill: color || 'var(--expo-theme-icon-default)' })));
368
+ function Logo(_a) {
369
+ var className = _a.className, rest = __rest(_a, ["className"]);
370
+ var _className = mergeClasses('icon-md text-icon-default', className);
371
+ return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", className: _className }, rest),
372
+ React.createElement("path", { d: "M9.477 7.638c.164-.24.343-.27.488-.27.145 0 .387.03.551.27 2.13 2.901 6.55 10.56 6.959 10.976.605.618 1.436.233 1.918-.468.475-.69.607-1.174.607-1.69 0-.352-6.883-13.05-7.576-14.106-.667-1.017-.884-1.274-2.025-1.274h-.854c-1.138 0-1.302.257-1.969 1.274C6.883 3.406 0 16.104 0 16.456c0 .517.132 1 .607 1.69.482.7 1.313 1.086 1.918.468.41-.417 4.822-8.075 6.952-10.977z", fill: "currentColor" })));
367
373
  }
368
374
 
369
- function SnackLogo(props) {
370
- var _a = props.title, title = _a === void 0 ? 'Snack-logo' : _a, color = props.color, titleId = props.titleId;
371
- return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", "aria-labelledby": titleId }, props),
372
- title ? React.createElement("title", { id: titleId }, title) : null,
373
- React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M17.168 1.152a2.752 2.752 0 100 5.504 2.752 2.752 0 000-5.504zm-2.43 2.752a2.429 2.429 0 014.608-1.075 3.805 3.805 0 01-3.701 2.925h-.051a2.423 2.423 0 01-.855-1.85zm-1.755-1.422a.16.16 0 01.081.14v4.825L17.23 9.86c.05.029.081.082.082.14l.026 4.92a.16.16 0 01-.081.14l-8.52 4.92a.161.161 0 01-.242-.14V10c0-.057.03-.11.08-.14l4.006-2.319-4.005-2.32a.161.161 0 010-.28l4.246-2.458a.161.161 0 01.162 0zm3.845 7.517L13.064 7.82v4.36L16.828 10zM8.978 5.08l3.764 2.18V2.901l-3.763 2.18z", fill: color || 'var(--expo-theme-icon-default)' }),
374
- React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M8.75.022a.161.161 0 00-.162 0l-4.242 2.46a.16.16 0 00-.019.01L.11 4.94l-.003.001a.161.161 0 00-.081.136v.004l-.013 4.994a.161.161 0 000 .125L0 14.92c0 .058.03.111.08.14l4.24 2.455.03.018 4.226 2.446a.161.161 0 00.242-.14v-9.746l4.166-2.412a.162.162 0 000-.28l-.081-.046V2.808l.08-.047a.162.162 0 000-.28L8.75.022zm3.828 2.597L8.67.35 4.74 2.626l3.917 2.267 3.922-2.275zM8.656 5.268L4.74 7.538l3.916 2.275L12.58 7.54 8.656 5.268zM4.419 7.352l3.915-2.27-3.916-2.268L.508 5.08 4.42 7.35zm-.165.277v4.692L.336 10.05l.012-4.69 3.906 2.268zm.323 4.879V7.817l3.918 2.275v4.685l-3.918-2.27zm-.323.186l-3.92-2.27-.01 4.403 3.93 2.276v-4.41zm.323 4.596v-4.41l3.918 2.27v4.408L4.577 17.29z", fill: color || 'var(--expo-theme-icon-default)' })));
375
+ function SnackLogo(_a) {
376
+ var className = _a.className, rest = __rest(_a, ["className"]);
377
+ var _className = mergeClasses('icon-md text-icon-default', className);
378
+ return (React.createElement("svg", __assign({ viewBox: "0 0 20 20", fill: "none", role: "img", className: _className }, rest),
379
+ React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M17.168 1.152a2.752 2.752 0 100 5.504 2.752 2.752 0 000-5.504zm-2.43 2.752a2.429 2.429 0 014.608-1.075 3.805 3.805 0 01-3.701 2.925h-.051a2.423 2.423 0 01-.855-1.85zm-1.755-1.422a.16.16 0 01.081.14v4.825L17.23 9.86c.05.029.081.082.082.14l.026 4.92a.16.16 0 01-.081.14l-8.52 4.92a.161.161 0 01-.242-.14V10c0-.057.03-.11.08-.14l4.006-2.319-4.005-2.32a.161.161 0 010-.28l4.246-2.458a.161.161 0 01.162 0zm3.845 7.517L13.064 7.82v4.36L16.828 10zM8.978 5.08l3.764 2.18V2.901l-3.763 2.18z", fill: "currentColor" }),
380
+ React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M8.75.022a.161.161 0 00-.162 0l-4.242 2.46a.16.16 0 00-.019.01L.11 4.94l-.003.001a.161.161 0 00-.081.136v.004l-.013 4.994a.161.161 0 000 .125L0 14.92c0 .058.03.111.08.14l4.24 2.455.03.018 4.226 2.446a.161.161 0 00.242-.14v-9.746l4.166-2.412a.162.162 0 000-.28l-.081-.046V2.808l.08-.047a.162.162 0 000-.28L8.75.022zm3.828 2.597L8.67.35 4.74 2.626l3.917 2.267 3.922-2.275zM8.656 5.268L4.74 7.538l3.916 2.275L12.58 7.54 8.656 5.268zM4.419 7.352l3.915-2.27-3.916-2.268L.508 5.08 4.42 7.35zm-.165.277v4.692L.336 10.05l.012-4.69 3.906 2.268zm.323 4.879V7.817l3.918 2.275v4.685l-3.918-2.27zm-.323.186l-3.92-2.27-.01 4.403 3.93 2.276v-4.41zm.323 4.596v-4.41l3.918 2.27v4.408L4.577 17.29z", fill: "currentColor" })));
375
381
  }
376
382
 
377
- function WordMarkLogo(props) {
378
- var _a = props.title, title = _a === void 0 ? 'Word-mark-logo' : _a, color = props.color, titleId = props.titleId;
379
- return (React.createElement("svg", __assign({ viewBox: "0 0 71 20", fill: "none", role: "img", "aria-labelledby": titleId }, props),
380
- title ? React.createElement("title", { id: titleId }, title) : null,
381
- React.createElement("path", { d: "M9.258 6.342c.158-.23.331-.26.472-.26.14 0 .374.03.532.26 2.06 2.806 6.332 10.208 6.727 10.611.585.597 1.388.225 1.854-.452.46-.667.587-1.135.587-1.634 0-.34-6.653-12.614-7.324-13.636C11.462.248 11.252 0 10.15 0h-.825c-1.1 0-1.259.248-1.903 1.23C6.75 2.254.097 14.528.097 14.868c0 .5.127.967.587 1.634.466.677 1.269 1.05 1.854.452.395-.403 4.661-7.805 6.72-10.61zm14.941-5.237v15.344h9.35v-3.113h-6.125v-3.244h5.45V6.98h-5.45V4.218h6.125V1.105h-9.35zM46.25 16.449l-3.88-5.568 3.619-5.195h-3.662L40.54 8.23l-1.765-2.543h-3.706l3.618 5.217-3.857 5.546h3.661l2.027-2.915 2.027 2.915h3.705zm7.572-10.982c-1.482 0-2.637.614-3.378 1.732V5.686H47.37V20h3.073v-5.063c.74 1.117 1.896 1.731 3.378 1.731 2.768 0 4.97-2.52 4.97-5.611 0-3.091-2.202-5.59-4.97-5.59zm-.697 8.242c-1.504 0-2.681-1.14-2.681-2.652 0-1.49 1.177-2.653 2.68-2.653 1.483 0 2.681 1.184 2.681 2.653 0 1.49-1.198 2.652-2.68 2.652zm12.188-8.242c-3.16 0-5.558 2.411-5.558 5.612 0 3.2 2.397 5.59 5.557 5.59 3.139 0 5.558-2.39 5.558-5.59 0-3.2-2.42-5.612-5.558-5.612zm0 2.96c1.438 0 2.55 1.117 2.55 2.652 0 1.49-1.112 2.63-2.55 2.63-1.46 0-2.55-1.14-2.55-2.63 0-1.535 1.09-2.653 2.55-2.653z", fill: color || 'var(--expo-theme-icon-default)' })));
383
+ function WordMarkLogo(_a) {
384
+ var className = _a.className, rest = __rest(_a, ["className"]);
385
+ var _className = mergeClasses('icon-md text-icon-default', className);
386
+ return (React.createElement("svg", __assign({ viewBox: "0 0 71 20", fill: "none", role: "img", className: _className }, rest),
387
+ React.createElement("path", { d: "M9.258 6.342c.158-.23.331-.26.472-.26.14 0 .374.03.532.26 2.06 2.806 6.332 10.208 6.727 10.611.585.597 1.388.225 1.854-.452.46-.667.587-1.135.587-1.634 0-.34-6.653-12.614-7.324-13.636C11.462.248 11.252 0 10.15 0h-.825c-1.1 0-1.259.248-1.903 1.23C6.75 2.254.097 14.528.097 14.868c0 .5.127.967.587 1.634.466.677 1.269 1.05 1.854.452.395-.403 4.661-7.805 6.72-10.61zm14.941-5.237v15.344h9.35v-3.113h-6.125v-3.244h5.45V6.98h-5.45V4.218h6.125V1.105h-9.35zM46.25 16.449l-3.88-5.568 3.619-5.195h-3.662L40.54 8.23l-1.765-2.543h-3.706l3.618 5.217-3.857 5.546h3.661l2.027-2.915 2.027 2.915h3.705zm7.572-10.982c-1.482 0-2.637.614-3.378 1.732V5.686H47.37V20h3.073v-5.063c.74 1.117 1.896 1.731 3.378 1.731 2.768 0 4.97-2.52 4.97-5.611 0-3.091-2.202-5.59-4.97-5.59zm-.697 8.242c-1.504 0-2.681-1.14-2.681-2.652 0-1.49 1.177-2.653 2.68-2.653 1.483 0 2.681 1.184 2.681 2.653 0 1.49-1.198 2.652-2.68 2.652zm12.188-8.242c-3.16 0-5.558 2.411-5.558 5.612 0 3.2 2.397 5.59 5.557 5.59 3.139 0 5.558-2.39 5.558-5.59 0-3.2-2.42-5.612-5.558-5.612zm0 2.96c1.438 0 2.55 1.117 2.55 2.652 0 1.49-1.112 2.63-2.55 2.63-1.46 0-2.55-1.14-2.55-2.63 0-1.535 1.09-2.653 2.55-2.653z", fill: "currentColor" })));
382
388
  }
383
389
 
384
390
  var shadows = {
@@ -848,6 +854,7 @@ exports.ThemeProvider = ThemeProvider;
848
854
  exports.WordMarkLogo = WordMarkLogo;
849
855
  exports.getInitialColorMode = getInitialColorMode;
850
856
  exports.isLocalStorageAvailable = isLocalStorageAvailable;
857
+ exports.mergeClasses = mergeClasses;
851
858
  exports.shadows = shadows;
852
859
  exports.theme = theme;
853
860
  exports.typography = typography;
@@ -0,0 +1 @@
1
+ export declare const mergeClasses: (...classLists: import("tailwind-merge/dist/lib/tw-join").ClassNameValue[]) => string;
@@ -1,3 +1,2 @@
1
- /// <reference types="react" />
2
- import { IconProps } from '../types';
3
- export declare function DocsLogo(props: IconProps): JSX.Element;
1
+ import { HTMLAttributes } from 'react';
2
+ export declare function DocsLogo({ className, ...rest }: HTMLAttributes<SVGSVGElement>): JSX.Element;
@@ -1,3 +1,2 @@
1
- /// <reference types="react" />
2
- import { IconProps } from '../types';
3
- export declare function ExpoGoLogo(props: IconProps): JSX.Element;
1
+ import { HTMLAttributes } from 'react';
2
+ export declare function ExpoGoLogo({ className, ...rest }: HTMLAttributes<SVGSVGElement>): JSX.Element;
@@ -1,3 +1,2 @@
1
- /// <reference types="react" />
2
- import { IconProps } from '../types';
3
- export declare function Logo(props: IconProps): JSX.Element;
1
+ import { HTMLAttributes } from 'react';
2
+ export declare function Logo({ className, ...rest }: HTMLAttributes<SVGSVGElement>): JSX.Element;
@@ -1,3 +1,2 @@
1
- /// <reference types="react" />
2
- import { IconProps } from '../types';
3
- export declare function SnackLogo(props: IconProps): JSX.Element;
1
+ import { HTMLAttributes } from 'react';
2
+ export declare function SnackLogo({ className, ...rest }: HTMLAttributes<SVGSVGElement>): JSX.Element;
@@ -1,3 +1,2 @@
1
- /// <reference types="react" />
2
- import { IconProps } from '../types';
3
- export declare function WordMarkLogo(props: IconProps): JSX.Element;
1
+ import { HTMLAttributes } from 'react';
2
+ export declare function WordMarkLogo({ className, ...rest }: HTMLAttributes<SVGSVGElement>): JSX.Element;
package/dist/tailwind.js CHANGED
@@ -330,9 +330,15 @@ const expoTailwindConfig = {
330
330
  },
331
331
  },
332
332
  screens: {
333
- small: '400px',
334
- medium: '900px',
335
- large: '1200px',
333
+ xs: '340px',
334
+ sm: '420px',
335
+ 'sm-gutters': '468px',
336
+ md: '740px',
337
+ 'md-gutters': '788px',
338
+ lg: '960px',
339
+ 'lg-gutters': '1008px',
340
+ xl: '1200px',
341
+ 'xl-gutters': '1248px',
336
342
  },
337
343
  extend: {
338
344
  height: {
@@ -344,15 +350,59 @@ const expoTailwindConfig = {
344
350
  scale: {
345
351
  98: '.98',
346
352
  },
353
+ gridTemplateColumns: {
354
+ 'auto-min-1': 'auto',
355
+ 'auto-min-2': 'minmax(min-content, auto) min-content',
356
+ 'auto-min-3': 'minmax(min-content, auto) repeat(2, min-content)',
357
+ 'auto-min-4': 'minmax(min-content, auto) repeat(3, min-content)',
358
+ 'auto-min-5': 'minmax(min-content, auto) repeat(4, min-content)',
359
+ 'auto-min-6': 'minmax(min-content, auto) repeat(5, min-content)',
360
+ 'auto-min-7': 'minmax(min-content, auto) repeat(6, min-content)',
361
+ 'auto-min-8': 'minmax(min-content, auto) repeat(7, min-content)',
362
+ },
363
+ transitionDuration: {
364
+ default: '150ms',
365
+ },
347
366
  },
348
367
  },
349
368
  corePlugins: {
350
369
  fontFamily: false,
351
370
  },
352
371
  plugins: [
353
- plugin(({ addVariant, matchUtilities, theme }) => {
372
+ plugin(({ addComponents, addVariant, matchUtilities, theme }) => {
354
373
  addVariant('hocus', ['&:hover', '&:focus-visible']);
355
374
  matchUtilities({ heading: (value) => value }, { values: theme('heading') });
375
+ addComponents({
376
+ '.icon-2xs': {
377
+ height: theme('height.3'),
378
+ width: theme('width.3'),
379
+ },
380
+ '.icon-xs': {
381
+ // note(simek): figure out how to access `h-3.5` using path
382
+ height: '0.875rem',
383
+ width: '0.875rem',
384
+ },
385
+ '.icon-sm': {
386
+ height: theme('height.4'),
387
+ width: theme('width.4'),
388
+ },
389
+ '.icon-md': {
390
+ height: theme('height.5'),
391
+ width: theme('width.5'),
392
+ },
393
+ '.icon-lg': {
394
+ height: theme('height.6'),
395
+ width: theme('width.6'),
396
+ },
397
+ '.icon-xl': {
398
+ height: theme('height.8'),
399
+ width: theme('width.8'),
400
+ },
401
+ '.icon-2xl': {
402
+ height: theme('height.10'),
403
+ width: theme('width.10'),
404
+ },
405
+ });
356
406
  }),
357
407
  ],
358
408
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@expo/styleguide",
3
- "version": "8.0.0-alpha.2",
3
+ "version": "8.0.0-alpha.4",
4
4
  "description": "Expo's styleguide components for use on the web.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -49,5 +49,5 @@
49
49
  "eslintConfig": {
50
50
  "extends": "universe/web"
51
51
  },
52
- "gitHead": "189e87d2507a9bb47c36acd8f0f878b9f63f9d22"
52
+ "gitHead": "35422c5d87d78da56ab4097c05b620c0bdaecd8e"
53
53
  }
package/tailwind.js CHANGED
@@ -330,9 +330,15 @@ const expoTailwindConfig = {
330
330
  },
331
331
  },
332
332
  screens: {
333
- small: '400px',
334
- medium: '900px',
335
- large: '1200px',
333
+ xs: '340px',
334
+ sm: '420px',
335
+ 'sm-gutters': '468px',
336
+ md: '740px',
337
+ 'md-gutters': '788px',
338
+ lg: '960px',
339
+ 'lg-gutters': '1008px',
340
+ xl: '1200px',
341
+ 'xl-gutters': '1248px',
336
342
  },
337
343
  extend: {
338
344
  height: {
@@ -344,15 +350,59 @@ const expoTailwindConfig = {
344
350
  scale: {
345
351
  98: '.98',
346
352
  },
353
+ gridTemplateColumns: {
354
+ 'auto-min-1': 'auto',
355
+ 'auto-min-2': 'minmax(min-content, auto) min-content',
356
+ 'auto-min-3': 'minmax(min-content, auto) repeat(2, min-content)',
357
+ 'auto-min-4': 'minmax(min-content, auto) repeat(3, min-content)',
358
+ 'auto-min-5': 'minmax(min-content, auto) repeat(4, min-content)',
359
+ 'auto-min-6': 'minmax(min-content, auto) repeat(5, min-content)',
360
+ 'auto-min-7': 'minmax(min-content, auto) repeat(6, min-content)',
361
+ 'auto-min-8': 'minmax(min-content, auto) repeat(7, min-content)',
362
+ },
363
+ transitionDuration: {
364
+ default: '150ms',
365
+ },
347
366
  },
348
367
  },
349
368
  corePlugins: {
350
369
  fontFamily: false,
351
370
  },
352
371
  plugins: [
353
- plugin(({ addVariant, matchUtilities, theme }) => {
372
+ plugin(({ addComponents, addVariant, matchUtilities, theme }) => {
354
373
  addVariant('hocus', ['&:hover', '&:focus-visible']);
355
374
  matchUtilities({ heading: (value) => value }, { values: theme('heading') });
375
+ addComponents({
376
+ '.icon-2xs': {
377
+ height: theme('height.3'),
378
+ width: theme('width.3'),
379
+ },
380
+ '.icon-xs': {
381
+ // note(simek): figure out how to access `h-3.5` using path
382
+ height: '0.875rem',
383
+ width: '0.875rem',
384
+ },
385
+ '.icon-sm': {
386
+ height: theme('height.4'),
387
+ width: theme('width.4'),
388
+ },
389
+ '.icon-md': {
390
+ height: theme('height.5'),
391
+ width: theme('width.5'),
392
+ },
393
+ '.icon-lg': {
394
+ height: theme('height.6'),
395
+ width: theme('width.6'),
396
+ },
397
+ '.icon-xl': {
398
+ height: theme('height.8'),
399
+ width: theme('width.8'),
400
+ },
401
+ '.icon-2xl': {
402
+ height: theme('height.10'),
403
+ width: theme('width.10'),
404
+ },
405
+ });
356
406
  }),
357
407
  ],
358
408
  };
package/dist/global.css DELETED
@@ -1,13 +0,0 @@
1
- @tailwind base;
2
- @tailwind components;
3
- @tailwind utilities;
4
-
5
- @layer components {
6
- .icon-md { @apply h-5 w-5; }
7
- .icon-2xs { @apply h-3 w-3; }
8
- .icon-xs { @apply h-3.5 w-3.5; }
9
- .icon-sm { @apply h-4 w-4; }
10
- .icon-lg { @apply h-6 w-6; }
11
- .icon-xl { @apply h-8 w-8; }
12
- .icon-2xl { @apply h-10 w-10; }
13
- }
@@ -1,10 +0,0 @@
1
- import * as React from 'react';
2
- export type IconProps = {
3
- size?: number | string;
4
- title?: string;
5
- color?: string;
6
- /**
7
- * A suffix added to the end of the unique generated ID for the icon. This is useful if you have multiple of the same icon on the page and need to pass accessibility guidelines.
8
- */
9
- titleId?: string;
10
- } & React.SVGProps<SVGSVGElement>;