Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

components: Remove wp-g2 from form-group and control-label #31234

Merged
merged 2 commits into from
Apr 27, 2021
Merged

components: Remove wp-g2 from form-group and control-label #31234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca40ed
components: Remove wp-g2 from form-group and control-label
sarayourfriend Apr 27, 2021
4e4a08c
Update snapshots
sarayourfriend Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/components/src/ui/control-label/stories/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ControlLabel } from '../index';

export default {
component: ControlLabel,
title: 'Components/ControlLabel',
title: 'G2 Components (Experimental)/ControlLabel',
};

export const _default = () => {
Expand Down
16 changes: 10 additions & 6 deletions packages/components/src/ui/control-label/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/**
* External dependencies
*/
import { css, getHighDpi, ui } from '@wp-g2/styles';
import { css } from 'emotion';

const lineHeight = `calc(${ ui.get( 'fontSize' ) } * 1.2)`;
/**
* Internal dependencies
*/
import CONFIG from '../../utils/config-values';
import { getHighDpi } from '../utils/get-high-dpi';

const lineHeight = `calc(${ CONFIG.fontSize } * 1.2)`;

/* eslint-disable jsdoc/valid-types */
/**
* @param {Parameters<typeof ui.get>[0]} size The padding size.
* @param {keyof CONFIG} size The padding size.
*/
/* eslint-enable jsdoc/valid-types */
function getPadding( size ) {
return `calc((${ ui.get( size ) } - ${ lineHeight }) / 2)`;
return `calc((${ CONFIG[ size ] } - ${ lineHeight }) / 2)`;
}

const highDpiAdjust = getHighDpi`
Expand Down
142 changes: 50 additions & 92 deletions packages/components/src/ui/control-label/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,15 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`props should render correctly 1`] = `
.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0 {
.emotion-0 {
display: inline-block;
line-height: calc(13px * 1.2);
line-height: calc(var(--wp-g2-font-size) * 1.2);
margin: 0;
max-width: 100%;
padding-bottom: calc((30px - calc(13px * 1.2)) / 2);
padding-bottom: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-top: calc((30px - calc(13px * 1.2)) / 2);
padding-top: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
}

.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0:active {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

@media (-webkit-min-device-pixel-ratio:1.25), (min-resolution:120dpi) {
.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0 > * {
position: relative;
top: 0.5px;
}
}

.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1 {
padding-bottom: calc((30px - calc(13px * 1.2)) / 2);
padding-bottom: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-top: calc((30px - calc(13px * 1.2)) / 2);
padding-top: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
}

.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3 {
display: inline-block;
vertical-align: middle;
}

.emotion-2 {
display: block;
overflow: hidden;
text-overflow: ellipsis;
Expand All @@ -49,10 +19,26 @@ exports[`props should render correctly 1`] = `
margin: 0;
font-size: calc((13 / 13) * 13px);
font-weight: normal;
display: inline-block;
vertical-align: middle;
}

.emotion-0:active {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

@media ( -webkit-min-device-pixel-ratio:1.25 ),( min-resolution:120dpi ) {
.emotion-0 > * {
position: relative;
top: 0.5px;
}
}

<label
class="emotion-0 emotion-1 components-truncate components-text components-control-label emotion-2 emotion-3 emotion-4 emotion-5"
class="components-truncate components-text components-control-label emotion-0 emotion-1 emotion-2"
data-wp-c16t="true"
data-wp-component="ControlLabel"
>
Expand All @@ -61,54 +47,40 @@ exports[`props should render correctly 1`] = `
`;

exports[`props should render no truncate 1`] = `
.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0 {
.emotion-0 {
display: inline-block;
line-height: calc(13px * 1.2);
line-height: calc(var(--wp-g2-font-size) * 1.2);
margin: 0;
max-width: 100%;
padding-bottom: calc((30px - calc(13px * 1.2)) / 2);
padding-bottom: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-top: calc((30px - calc(13px * 1.2)) / 2);
padding-top: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-bottom: calc((30px - calc(13px * 1.2)) / 2);
padding-top: calc((30px - calc(13px * 1.2)) / 2);
color: #000;
line-height: 1.2;
margin: 0;
font-size: calc((13 / 13) * 13px);
font-weight: normal;
display: inline-block;
vertical-align: middle;
}

.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0:active {
.emotion-0:active {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

@media (-webkit-min-device-pixel-ratio:1.25), (min-resolution:120dpi) {
.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0 > * {
@media ( -webkit-min-device-pixel-ratio:1.25 ),( min-resolution:120dpi ) {
.emotion-0 > * {
position: relative;
top: 0.5px;
}
}

.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1 {
padding-bottom: calc((30px - calc(13px * 1.2)) / 2);
padding-bottom: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-top: calc((30px - calc(13px * 1.2)) / 2);
padding-top: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
}

.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3 {
display: inline-block;
vertical-align: middle;
}

.emotion-2 {
color: #000;
line-height: 1.2;
margin: 0;
font-size: calc((13 / 13) * 13px);
font-weight: normal;
}

<label
class="emotion-0 emotion-1 components-truncate components-text components-control-label emotion-2 emotion-3 emotion-4 emotion-5"
class="components-truncate components-text components-control-label emotion-0 emotion-1 emotion-2"
data-wp-c16t="true"
data-wp-component="ControlLabel"
>
Expand All @@ -117,58 +89,44 @@ exports[`props should render no truncate 1`] = `
`;

exports[`props should render size 1`] = `
.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0 {
.emotion-0 {
display: inline-block;
line-height: calc(13px * 1.2);
line-height: calc(var(--wp-g2-font-size) * 1.2);
margin: 0;
max-width: 100%;
padding-bottom: calc((30px - calc(13px * 1.2)) / 2);
padding-bottom: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-top: calc((30px - calc(13px * 1.2)) / 2);
padding-top: calc((var(--wp-g2-control-height) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-bottom: calc((calc( 30px * 0.8 ) - calc(13px * 1.2)) / 2);
padding-top: calc((calc( 30px * 0.8 ) - calc(13px * 1.2)) / 2);
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #000;
line-height: 1.2;
margin: 0;
font-size: calc((13 / 13) * 13px);
font-weight: normal;
display: inline-block;
vertical-align: middle;
}

.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0:active {
.emotion-0:active {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

@media (-webkit-min-device-pixel-ratio:1.25), (min-resolution:120dpi) {
.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0.emotion-0 > * {
@media ( -webkit-min-device-pixel-ratio:1.25 ),( min-resolution:120dpi ) {
.emotion-0 > * {
position: relative;
top: 0.5px;
}
}

.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1.emotion-1 {
padding-bottom: calc((calc(30px * 0.8) - calc(13px * 1.2)) / 2);
padding-bottom: calc((var(--wp-g2-control-height-small) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
padding-top: calc((calc(30px * 0.8) - calc(13px * 1.2)) / 2);
padding-top: calc((var(--wp-g2-control-height-small) - calc(var(--wp-g2-font-size) * 1.2)) / 2);
}

.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3.emotion-3 {
display: inline-block;
vertical-align: middle;
}

.emotion-2 {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #000;
line-height: 1.2;
margin: 0;
font-size: calc((13 / 13) * 13px);
font-weight: normal;
}

<label
class="emotion-0 emotion-1 components-truncate components-text components-control-label emotion-2 emotion-3 emotion-4 emotion-5"
class="components-truncate components-text components-control-label emotion-0 emotion-1 emotion-2"
data-wp-c16t="true"
data-wp-component="ControlLabel"
>
Expand Down
11 changes: 1 addition & 10 deletions packages/components/src/ui/form-group/form-group-content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/**
* External dependencies
*/
import { ui } from '@wp-g2/styles';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -37,11 +32,7 @@ function FormGroupContent( {
] );

const content = help ? (
<VStack
expanded={ false }
{ ...ui.$( 'FormGroupContentContainer' ) }
spacing={ spacing }
>
<VStack expanded={ false } spacing={ spacing }>
{ children }
<FormGroupHelp>{ help }</FormGroupHelp>
</VStack>
Expand Down
9 changes: 5 additions & 4 deletions packages/components/src/ui/form-group/form-group-help.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/**
* External dependencies
*/
import { ContextSystemProvider } from '@wp-g2/context';
/**
* WordPress dependencies
*/
import { memo } from '@wordpress/element';

/**
* Internal dependencies
*/
import { ContextSystemProvider } from '../context';

const contextValue = { Text: { variant: 'muted' } };

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/ui/form-group/stories/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const TextInput = ( { id: idProp, ...props } ) => {

export default {
component: FormGroup,
title: 'Components/FormGroup',
title: 'G2 Components (Experimental)/FormGroup',
};

export const _default = () => {
Expand Down
Loading