mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-08 23:58:13 +08:00
fix(label): properly float labels for non-input items (#23060)
This commit is contained in:
Brandy Carney
@ -176,11 +176,11 @@
|
|||||||
// When used with a floating item the placeholder should hide
|
// When used with a floating item the placeholder should hide
|
||||||
|
|
||||||
:host-context(.item-label-floating.item-has-placeholder:not(.item-has-value)) {
|
:host-context(.item-label-floating.item-has-placeholder:not(.item-has-value)) {
|
||||||
transition: opacity 0.15s cubic-bezier(0.4, 0, 0.2, 1);
|
|
||||||
|
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
:host-context(.item-label-floating.item-has-placeholder:not(.item-has-value).item-has-focus) {
|
:host-context(.item-label-floating.item-has-placeholder:not(.item-has-value).item-has-focus) {
|
||||||
|
transition: opacity 0.15s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,18 +23,23 @@
|
|||||||
|
|
||||||
:host(.label-floating) {
|
:host(.label-floating) {
|
||||||
@include margin(null, null, 0, null);
|
@include margin(null, null, 0, null);
|
||||||
@include transform(translate3d(0, 27px, 0));
|
@include transform(translate3d(0, 29px, 0));
|
||||||
@include transform-origin(start, top);
|
@include transform-origin(start, top);
|
||||||
|
|
||||||
transition: transform 150ms ease-in-out;
|
transition: transform 150ms ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:host-context(.item-textarea).label-floating {
|
||||||
|
@include transform(translate3d(0, 28px, 0));
|
||||||
|
}
|
||||||
|
|
||||||
:host-context(.item-has-focus).label-stacked,
|
:host-context(.item-has-focus).label-stacked,
|
||||||
:host-context(.item-has-focus).label-floating {
|
:host-context(.item-has-focus).label-floating {
|
||||||
color: $label-ios-text-color-focused;
|
color: $label-ios-text-color-focused;
|
||||||
}
|
}
|
||||||
|
|
||||||
:host-context(.item-has-focus).label-floating,
|
:host-context(.item-has-focus).label-floating,
|
||||||
|
:host-context(.item-has-placeholder:not(.item-input)).label-floating,
|
||||||
:host-context(.item-has-value).label-floating {
|
:host-context(.item-has-value).label-floating {
|
||||||
@include transform(translate3d(0, 0, 0), scale(.82));
|
@include transform(translate3d(0, 0, 0), scale(.82));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,12 +33,17 @@
|
|||||||
transform 150ms $label-md-transition-timing-function;
|
transform 150ms $label-md-transition-timing-function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:host-context(.item-textarea).label-floating {
|
||||||
|
@include transform(translateY(185%));
|
||||||
|
}
|
||||||
|
|
||||||
:host(.label-stacked),
|
:host(.label-stacked),
|
||||||
:host(.label-floating) {
|
:host(.label-floating) {
|
||||||
@include margin(0, 0, 0, 0);
|
@include margin(0, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
:host-context(.item-has-focus).label-floating,
|
:host-context(.item-has-focus).label-floating,
|
||||||
|
:host-context(.item-has-placeholder:not(.item-input)).label-floating,
|
||||||
:host-context(.item-has-value).label-floating {
|
:host-context(.item-has-value).label-floating {
|
||||||
@include transform(translateY(50%), scale(.75));
|
@include transform(translateY(50%), scale(.75));
|
||||||
}
|
}
|
||||||
|
|||||||
121
core/src/components/label/test/floating/index.html
Normal file
121
core/src/components/label/test/floating/index.html
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" dir="ltr">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Label - Floating</title>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
|
||||||
|
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet">
|
||||||
|
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
|
||||||
|
<script src="../../../../../scripts/testing/scripts.js"></script>
|
||||||
|
<script nomodule src="../../../../../dist/ionic/ionic.js"></script>
|
||||||
|
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script></head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<ion-app>
|
||||||
|
|
||||||
|
<ion-header>
|
||||||
|
<ion-toolbar>
|
||||||
|
<ion-title>Label - Floating</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
<ion-content>
|
||||||
|
<ion-list>
|
||||||
|
<ion-list-header>
|
||||||
|
<ion-label>Default</ion-label>
|
||||||
|
</ion-list-header>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Input</ion-label>
|
||||||
|
<ion-input></ion-input>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Textarea</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Datetime</ion-label>
|
||||||
|
<ion-datetime></ion-datetime>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Select</ion-label>
|
||||||
|
<ion-select>
|
||||||
|
<ion-select-option>Option</ion-select-option>
|
||||||
|
</ion-select>
|
||||||
|
</ion-item>
|
||||||
|
</ion-list>
|
||||||
|
|
||||||
|
<ion-list>
|
||||||
|
<ion-list-header>
|
||||||
|
<ion-label>Placeholders</ion-label>
|
||||||
|
</ion-list-header>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Input</ion-label>
|
||||||
|
<ion-input placeholder="Placeholder Text"></ion-input>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Textarea</ion-label>
|
||||||
|
<ion-textarea placeholder="Placeholder Text"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Datetime</ion-label>
|
||||||
|
<ion-datetime placeholder="Placeholder Text"></ion-datetime>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Select</ion-label>
|
||||||
|
<ion-select placeholder="Placeholder Text">
|
||||||
|
<ion-select-option>Option</ion-select-option>
|
||||||
|
</ion-select>
|
||||||
|
</ion-item>
|
||||||
|
</ion-list>
|
||||||
|
|
||||||
|
<ion-list>
|
||||||
|
<ion-list-header>
|
||||||
|
<ion-label>Values</ion-label>
|
||||||
|
</ion-list-header>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Input</ion-label>
|
||||||
|
<ion-input value="Input Value"></ion-input>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Textarea</ion-label>
|
||||||
|
<ion-textarea value="Textarea Value"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Datetime</ion-label>
|
||||||
|
<ion-datetime value="2020-03-04"></ion-datetime>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Select</ion-label>
|
||||||
|
<ion-select value="option">
|
||||||
|
<ion-select-option value="option">Option</ion-select-option>
|
||||||
|
</ion-select>
|
||||||
|
</ion-item>
|
||||||
|
</ion-list>
|
||||||
|
</ion-content>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
ion-content {
|
||||||
|
--background: #f6f6f6;
|
||||||
|
}
|
||||||
|
|
||||||
|
ion-list {
|
||||||
|
background: transparent !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</ion-app>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
237
core/src/components/textarea/test/spec/index.html
Normal file
237
core/src/components/textarea/test/spec/index.html
Normal file
@ -0,0 +1,237 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" dir="ltr">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Textarea - Spec</title>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||||
|
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet">
|
||||||
|
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
|
||||||
|
<script src="../../../../../scripts/testing/scripts.js"></script>
|
||||||
|
<script nomodule src="../../../../../dist/ionic/ionic.js"></script>
|
||||||
|
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script></head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<ion-app>
|
||||||
|
<ion-header>
|
||||||
|
<ion-toolbar>
|
||||||
|
<ion-title>Textarea - Spec</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
<ion-content>
|
||||||
|
<h1>Floating Textareas</h1>
|
||||||
|
|
||||||
|
<div class="grid">
|
||||||
|
<div class="column">
|
||||||
|
<h2>Inactive</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Label</ion-label>
|
||||||
|
<ion-textarea placeholder="Placeholder Text"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Focused</h2>
|
||||||
|
<ion-item class="item-has-focus">
|
||||||
|
<ion-label position="floating">Label</ion-label>
|
||||||
|
<ion-textarea placeholder="Placeholder Text"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Activated</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Label</ion-label>
|
||||||
|
<ion-textarea placeholder="Placeholder Text" value="Textarea Text"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Hover</h2>
|
||||||
|
<ion-item class="item-hovered">
|
||||||
|
<ion-label position="floating">Label</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Disabled</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Label</ion-label>
|
||||||
|
<ion-textarea disabled></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Toggle Placeholder</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Label</ion-label>
|
||||||
|
<ion-textarea id="floatingToggle" type="password"></ion-textarea>
|
||||||
|
<ion-button fill="clear" slot="end" onClick="togglePlaceholder('#floatingToggle')" class="ion-align-self-center">
|
||||||
|
Toggle
|
||||||
|
</ion-button>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h1>Stacked textareas</h1>
|
||||||
|
|
||||||
|
<div class="grid">
|
||||||
|
<div class="column">
|
||||||
|
<h2>Inactive</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Focused</h2>
|
||||||
|
<ion-item class="item-has-focus">
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<ion-textarea placeholder="Placeholder Text"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Activated</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<ion-textarea placeholder="Placeholder Text" value="textarea Text"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Hover</h2>
|
||||||
|
<ion-item class="item-hovered">
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Disabled</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<ion-textarea disabled></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
<h2>Toggle Placeholder</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<ion-textarea id="stackedToggle" type="password"></ion-textarea>
|
||||||
|
<ion-button fill="clear" slot="end" onClick="togglePlaceholder('#stackedToggle')" class="ion-align-self-center">
|
||||||
|
Toggle
|
||||||
|
</ion-button>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr>
|
||||||
|
|
||||||
|
<h2>Stacked Div</h2>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="stacked">Label</ion-label>
|
||||||
|
<div>A div</div>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
<ion-item class="ion-align-items-center">
|
||||||
|
<ion-icon slot="start" name="planet"></ion-icon>
|
||||||
|
<ion-label position="stacked">Align items: center</ion-label>
|
||||||
|
<div>A div</div>
|
||||||
|
</ion-item>
|
||||||
|
<ion-item class="ion-align-items-center">
|
||||||
|
<ion-icon slot="start" name="planet"></ion-icon>
|
||||||
|
<ion-label position="stacked">Align items: center</ion-label>
|
||||||
|
<div class="ion-align-self-end">A div: align self right</div>
|
||||||
|
</ion-item>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Floating: textarea</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="floating">Floating: textarea value</ion-label>
|
||||||
|
<ion-textarea value="value"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label position="stacked">Stacked: textarea</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
<ion-item class="item-has-focus">
|
||||||
|
<ion-label position="stacked">Stacked: textarea focused value</ion-label>
|
||||||
|
<ion-textarea value="value"></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
<ion-item class="custom item-has-focus">
|
||||||
|
<ion-label position="stacked">Stacked: textarea focus</ion-label>
|
||||||
|
<ion-textarea></ion-textarea>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
|
</ion-content>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
h1 {
|
||||||
|
font-size: 14px;
|
||||||
|
color: #54575e;
|
||||||
|
|
||||||
|
margin: 25px 0 5px 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: normal;
|
||||||
|
|
||||||
|
color: #a1a7b0;
|
||||||
|
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr {
|
||||||
|
background: #eff1f3;
|
||||||
|
|
||||||
|
margin-top: 18px;
|
||||||
|
margin-bottom: 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, 1fr);
|
||||||
|
row-gap: 20px;
|
||||||
|
column-gap: 20px;
|
||||||
|
padding: 0 20px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
ion-item {
|
||||||
|
--background: #e0e0e0;
|
||||||
|
--background-hover: #d3d3d3;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom {
|
||||||
|
--background: lightblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom ion-label {
|
||||||
|
color: white !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom.item-has-focus ion-label {
|
||||||
|
color: purple !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function togglePlaceholder(id) {
|
||||||
|
const textarea = document.querySelector(id);
|
||||||
|
textarea.placeholder = textarea.placeholder ? undefined : 'Placeholder Text';
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</ion-app>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
@ -135,3 +135,18 @@
|
|||||||
|
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Item Floating: Placeholder
|
||||||
|
// ----------------------------------------------------------------
|
||||||
|
// When used with a floating item the placeholder should hide
|
||||||
|
|
||||||
|
:host-context(.item-label-floating.item-has-placeholder:not(.item-has-value)) {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host-context(.item-label-floating.item-has-placeholder:not(.item-has-value).item-has-focus) {
|
||||||
|
transition: opacity 0.15s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user