Skip to content

Commit 371eff0

Browse files
committed
Standardization - Field Display Type and Focus state
1 parent 8805724 commit 371eff0

File tree

7 files changed

+47
-867
lines changed

7 files changed

+47
-867
lines changed

src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@
3939
import gwt.material.design.addins.client.combobox.js.options.Params;
4040
import gwt.material.design.client.MaterialDesignBase;
4141
import gwt.material.design.client.base.*;
42-
import gwt.material.design.client.base.mixin.EnabledMixin;
43-
import gwt.material.design.client.base.mixin.FieldTypeMixin;
44-
import gwt.material.design.client.base.mixin.ReadOnlyMixin;
45-
import gwt.material.design.client.base.mixin.StatusTextMixin;
42+
import gwt.material.design.client.base.mixin.*;
4643
import gwt.material.design.client.constants.CssName;
4744
import gwt.material.design.client.constants.FieldType;
4845
import gwt.material.design.client.ui.MaterialLabel;
46+
import gwt.material.design.client.ui.MaterialToast;
4947
import gwt.material.design.client.ui.html.Label;
5048
import gwt.material.design.client.ui.html.OptGroup;
5149
import gwt.material.design.client.ui.html.Option;
@@ -119,9 +117,9 @@ public MaterialComboBox() {
119117
@Override
120118
protected void onLoad() {
121119
label.setInitialClasses(AddinsCssName.SELECT2LABEL);
122-
super.add(listbox);
123-
super.add(label);
124-
super.add(errorLabel);
120+
addWidget(listbox);
121+
addWidget(label);
122+
addWidget(errorLabel);
125123
errorLabel.setMarginTop(8);
126124
listbox.setGwtDisplay(Style.Display.BLOCK);
127125

@@ -171,6 +169,8 @@ public void load() {
171169
if (getTextColor() != null) {
172170
$(getElement()).find(".select2-selection__rendered").css("color", getTextColor().getCssName());
173171
}
172+
173+
getStatusTextMixin().getStatusDisplayMixin().setContainer(new MaterialWidget($(getElement())));
174174
}
175175

176176
@Override
@@ -218,6 +218,10 @@ public void add(Widget child) {
218218
listbox.add(child);
219219
}
220220

221+
public void addWidget(Widget widget) {
222+
super.add(widget);
223+
}
224+
221225
/**
222226
* Add OptionGroup directly to combobox component
223227
*

src/main/java/gwt/material/design/addins/client/stepper/MaterialStep.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import gwt.material.design.addins.client.stepper.constants.State;
3232
import gwt.material.design.client.base.*;
3333
import gwt.material.design.client.base.mixin.ActiveMixin;
34+
import gwt.material.design.client.base.mixin.StatusDisplayMixin;
3435
import gwt.material.design.client.constants.Axis;
3536
import gwt.material.design.client.constants.CssName;
3637
import gwt.material.design.client.constants.IconType;
@@ -249,6 +250,11 @@ public StatusDisplayType getStatusDisplayType() {
249250
return displayType;
250251
}
251252

253+
@Override
254+
public void updateStatusDisplay(StatusDisplayMixin.StatusType statusType) {
255+
// Nothing for now
256+
}
257+
252258
protected void applyIconStatus(MaterialIcon icon, String description) {
253259
iconError.removeFromParent();
254260
iconSuccess.removeFromParent();

src/main/java/gwt/material/design/addins/client/stepper/MaterialStepper.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,15 @@
4343
import gwt.material.design.client.base.HasStatusText;
4444
import gwt.material.design.client.base.MaterialWidget;
4545
import gwt.material.design.client.base.mixin.CssNameMixin;
46+
import gwt.material.design.client.base.mixin.StatusDisplayMixin;
4647
import gwt.material.design.client.constants.Axis;
47-
import gwt.material.design.client.constants.Color;
4848
import gwt.material.design.client.constants.StatusDisplayType;
4949
import gwt.material.design.client.js.Window;
5050
import gwt.material.design.client.ui.MaterialLoader;
5151
import gwt.material.design.client.ui.animate.MaterialAnimation;
5252
import gwt.material.design.client.ui.animate.Transition;
5353
import gwt.material.design.client.ui.html.Div;
5454
import gwt.material.design.client.ui.html.Span;
55-
import org.apache.regexp.RE;
5655

5756
//@formatter:off
5857

@@ -462,6 +461,11 @@ public StatusDisplayType getStatusDisplayType() {
462461
return getCurrentStep().getStatusDisplayType();
463462
}
464463

464+
@Override
465+
public void updateStatusDisplay(StatusDisplayMixin.StatusType statusType) {
466+
getCurrentStep().updateStatusDisplay(statusType);
467+
}
468+
465469
/**
466470
* Get feedback message.
467471
*/

src/main/resources/gwt/material/design/addins/client/combobox/resources/css/select2.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,4 +854,20 @@ ul.select2-results__options[aria-multiselectable=true] li.select2-results__optio
854854
.input-field.filled.combobox .select2-container--default .select2-selection--single .select2-selection__rendered {
855855
padding-left: 12px;
856856
padding-top: 4px
857+
}
858+
859+
/** Focus **/
860+
.input-field.combobox .select2-container--focus .select2-selection {
861+
border-bottom: 1px solid #42a5f5;
862+
box-shadow: 0 1px 0 0 #42a5f5;
863+
}
864+
865+
.input-field.outlined.combobox .select2-container--focus .select2-selection {
866+
border: 2px solid #42a5f5;
867+
box-shadow: none;
868+
}
869+
870+
/** Hoverable Status **/
871+
.input-field.hoverable-status .select2-container--default .select2-selection--single .select2-selection__arrow {
872+
display: none;
857873
}

0 commit comments

Comments
 (0)