Skip to content

Commit

Permalink
[NoSsr] Move NoSsr to the Unstyled package (#27356)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak authored Jul 21, 2021
1 parent dd1d07b commit e85ce44
Show file tree
Hide file tree
Showing 30 changed files with 63 additions and 47 deletions.
2 changes: 1 addition & 1 deletion docs/pages/api-docs/no-ssr.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "NoSsr",
"styles": { "classes": [], "globalClasses": {}, "name": null },
"spread": false,
"filename": "/packages/material-ui/src/NoSsr/NoSsr.js",
"filename": "/packages/material-ui-unstyled/src/NoSsr/NoSsr.js",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/no-ssr/\">No Ssr</a></li></ul>",
"styledComponent": true,
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/slider-emotion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Slider from '@material-ui/core/Slider';

const data = {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/slider-jss.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Slider from '@material-ui/core/Slider';

const data = {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/system.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Box from '@material-ui/core/Box';

export default function SxPropBoxMaterialUI() {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/table-component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const createComponent = (defaultComponent) => {
const MyComponent = React.forwardRef(function MyComponent(props, ref) {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/table-emotion.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import styled from '@emotion/styled';
// import { styled } from '@material-ui/core/styles';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const createComponent = (defaultComponent) => {
const Root = styled('div')`
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/table-hook.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { makeStyles } from '@material-ui/styles';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const createComponent = (defaultComponent) => {
const useStyles = makeStyles({
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/table-mui.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Table from '@material-ui/core/Table';
import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/table-raw.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const data = { name: 'Frozen yoghurt', calories: 159, fat: 6.0, carbs: 24, protein: 4.0 };
const rows = Array.from(new Array(100)).map(() => data);
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/performance/table-styled-components.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const createComponent = (defaultComponent) => {
const MyComponent = React.forwardRef(function MyComponent(props, ref) {
Expand Down
10 changes: 10 additions & 0 deletions docs/src/pages/components/no-ssr/no-ssr.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,13 @@ You can **wait a screen frame** with the `defer` property to render the children
React does [2 commits](https://reactjs.org/docs/strict-mode.html#detecting-unexpected-side-effects) instead of 1.

{{"demo": "pages/components/no-ssr/FrameDeferring.js"}}

## Unstyled

- 📦 [784 B gzipped](https://bundlephobia.com/result?p=@material-ui/unstyled@next)

As the component does not have any styles, it also comes with the unstyled package.

```js
import NoSsr from '@material-ui/unstyled/NoSsr';
```
2 changes: 1 addition & 1 deletion docs/src/pages/landing/Quotes.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import Avatar from '@material-ui/core/Avatar';
import TwitterIcon from '@material-ui/icons/Twitter';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Container from '@material-ui/core/Container';
import Divider from '@material-ui/core/Divider';
import { useTranslate } from 'docs/src/modules/utils/i18n';
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/landing/Sponsors.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/styles';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import MarkdownElement from 'docs/src/modules/components/MarkdownElement';
import Container from '@material-ui/core/Container';
import Divider from '@material-ui/core/Divider';
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/landing/Themes.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Typography from '@material-ui/core/Typography';
import Container from '@material-ui/core/Container';
import Grid from '@material-ui/core/Grid';
import Button from '@material-ui/core/Button';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Box from '@material-ui/core/Box';
import Link from 'docs/src/modules/components/Link';
import { useTranslate } from 'docs/src/modules/utils/i18n';
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/landing/Users.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import clsx from 'clsx';
import { makeStyles } from '@material-ui/styles';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import Divider from '@material-ui/core/Divider';
import Grid from '@material-ui/core/Grid';
import Container from '@material-ui/core/Container';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import styled from 'styled-components';
import { palette, spacing } from '@material-ui/system';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const Div = styled.div`
${palette}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import styled from 'styled-components';
import { palette, PaletteProps, spacing, SpacingProps } from '@material-ui/system';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

const Div = styled.div<PaletteProps & SpacingProps>`
${palette}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/system/advanced/StyleFunctionSxDemo.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import styled, { ThemeProvider } from 'styled-components';
import { unstable_styleFunctionSx } from '@material-ui/system';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import { createTheme } from '@material-ui/core/styles';

const theme = createTheme();
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/system/advanced/StyleFunctionSxDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import styled, { InterpolationFunction, ThemeProvider } from 'styled-components';
import { unstable_styleFunctionSx, SxProps } from '@material-ui/system';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import { createTheme } from '@material-ui/core/styles';

interface DivProps {
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui-docs/src/NProgressBar/NProgressBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import NProgress from 'nprogress';
import { withStyles } from '@material-ui/styles';
import { createTheme } from '@material-ui/core/styles';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';
import { exactProp } from '@material-ui/utils';

NProgress.configure({
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { exactProp } from '@material-ui/utils';
import useEnhancedEffect from '../utils/useEnhancedEffect';
import { exactProp, unstable_useEnhancedEffect as useEnhancedEffect } from '@material-ui/utils';

/**
* NoSsr purposely removes components from the subject of Server Side Rendering (SSR).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { createClientRender, createServerRender } from 'test/utils';
import NoSsr from '@material-ui/core/NoSsr';
import NoSsr from '@material-ui/unstyled/NoSsr';

describe('<NoSsr />', () => {
const render = createClientRender();
Expand Down
2 changes: 2 additions & 0 deletions packages/material-ui-unstyled/src/NoSsr/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { default } from './NoSsr';
export * from './NoSsr';
1 change: 1 addition & 0 deletions packages/material-ui-unstyled/src/NoSsr/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './NoSsr';
26 changes: 14 additions & 12 deletions packages/material-ui-unstyled/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,30 @@ export * from './BackdropUnstyled';
export { default as BadgeUnstyled } from './BadgeUnstyled';
export * from './BadgeUnstyled';

export { default as unstable_composeClasses } from './composeClasses';
export * from './composeClasses';

export { default as generateUtilityClass } from './generateUtilityClass';
export * from './generateUtilityClass';

export { default as generateUtilityClasses } from './generateUtilityClasses';
export * from './generateUtilityClasses';

export { default as ModalUnstyled } from './ModalUnstyled';
export * from './ModalUnstyled';

export { default as NoSsr } from './NoSsr';

export { default as Portal } from './Portal';
export * from './Portal';

export { default as SliderUnstyled } from './SliderUnstyled';
export * from './SliderUnstyled';

export { default as SwitchUnstyled } from './SwitchUnstyled';
export * from './SwitchUnstyled';

export { default as Portal } from './Portal';
export * from './Portal';

export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';
export * from './Unstable_TrapFocus';

export { default as generateUtilityClass } from './generateUtilityClass';
export * from './generateUtilityClass';

export { default as generateUtilityClasses } from './generateUtilityClasses';
export * from './generateUtilityClasses';

export { default as unstable_composeClasses } from './composeClasses';
export * from './composeClasses';

export * from './utils';
20 changes: 11 additions & 9 deletions packages/material-ui-unstyled/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@ export * from './BackdropUnstyled';
export { default as BadgeUnstyled } from './BadgeUnstyled';
export * from './BadgeUnstyled';

export { default as SliderUnstyled } from './SliderUnstyled';
export * from './SliderUnstyled';
export { default as unstable_composeClasses } from './composeClasses';

export { default as SwitchUnstyled } from './SwitchUnstyled';
export * from './SwitchUnstyled';
export { default as generateUtilityClass } from './generateUtilityClass';

export { default as generateUtilityClasses } from './generateUtilityClasses';

export { default as ModalUnstyled } from './ModalUnstyled';
export * from './ModalUnstyled';

export { default as Portal } from './Portal';
export { default as NoSsr } from './NoSsr';

export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';
export { default as Portal } from './Portal';

export { default as generateUtilityClass } from './generateUtilityClass';
export { default as SliderUnstyled } from './SliderUnstyled';
export * from './SliderUnstyled';

export { default as generateUtilityClasses } from './generateUtilityClasses';
export { default as SwitchUnstyled } from './SwitchUnstyled';
export * from './SwitchUnstyled';

export { default as unstable_composeClasses } from './composeClasses';
export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';

export * from './utils';
4 changes: 2 additions & 2 deletions packages/material-ui/src/NoSsr/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default } from './NoSsr';
export * from './NoSsr';
export { default } from '@material-ui/unstyled/NoSsr';
export * from '@material-ui/unstyled/NoSsr';
2 changes: 1 addition & 1 deletion packages/material-ui/src/NoSsr/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from './NoSsr';
export { default } from '@material-ui/unstyled/NoSsr';
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import { elementTypeAcceptingRef } from '@material-ui/utils';
import { useThemeProps } from '@material-ui/system';
import { NoSsr } from '@material-ui/unstyled';
import Drawer, { getAnchor, isHorizontal } from '../Drawer/Drawer';
import ownerDocument from '../utils/ownerDocument';
import ownerWindow from '../utils/ownerWindow';
Expand All @@ -10,7 +11,6 @@ import useEnhancedEffect from '../utils/useEnhancedEffect';
import { duration } from '../styles/createTransitions';
import useTheme from '../styles/useTheme';
import { getTransitionProps } from '../transitions/utils';
import NoSsr from '../NoSsr';
import SwipeArea from './SwipeArea';

// This value is closed to what browsers are using internally to
Expand Down

0 comments on commit e85ce44

Please sign in to comment.