Skip to content

Commit 3d0d9f2

Browse files
committed
fix(cardview): borderRadius regression after shape addition
1 parent 6cba438 commit 3d0d9f2

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/cardview/cardview.ios.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ export class CardView extends CardViewBase {
6262
applyShapeScheme() {
6363
if (this.scheme) {
6464
this.scheme.shapeScheme = this.shapeScheme;
65-
console.log('applyShapeScheme');
6665
this.nativeViewProtected.applyThemeWithScheme(this.scheme);
6766
}
6867
}
@@ -90,11 +89,11 @@ export class CardView extends CardViewBase {
9089
// it will change for everyone else
9190
this.shapeScheme = MDCShapeScheme.new();
9291
const shapeScheme = themer.getShape(this.shape);
93-
this.shapeScheme.smallComponentShape = shapeScheme.smallComponentShape.copy();
92+
this.shapeScheme.mediumComponentShape = shapeScheme.smallComponentShape.copy();
9493
} else {
9594
this.shapeScheme = MDCShapeScheme.new();
9695
const shapeCategory = MDCShapeCategory.new();
97-
this.shapeScheme.smallComponentShape = shapeCategory;
96+
this.shapeScheme.mediumComponentShape = shapeCategory;
9897
}
9998
}
10099
return this.shapeScheme;
@@ -104,36 +103,36 @@ export class CardView extends CardViewBase {
104103
const shapeScheme = this.getShapeScheme();
105104
const current = shapeScheme.smallComponentShape.bottomLeftCorner;
106105
if (current instanceof MDCCutCornerTreatment) {
107-
shapeScheme.smallComponentShape.bottomLeftCorner = MDCCornerTreatment.cornerWithCut(value);
106+
shapeScheme.mediumComponentShape.bottomLeftCorner = MDCCornerTreatment.cornerWithCut(value);
108107
} else {
109-
shapeScheme.smallComponentShape.bottomLeftCorner = MDCCornerTreatment.cornerWithRadius(value);
108+
shapeScheme.mediumComponentShape.bottomLeftCorner = MDCCornerTreatment.cornerWithRadius(value);
110109
}
111110
}
112111
private setBottomRightCornerRadius(value: number) {
113112
const shapeScheme = this.getShapeScheme();
114113
const current = shapeScheme.smallComponentShape.bottomRightCorner;
115114
if (current instanceof MDCCutCornerTreatment) {
116-
shapeScheme.smallComponentShape.bottomRightCorner = MDCCornerTreatment.cornerWithCut(value);
115+
shapeScheme.mediumComponentShape.bottomRightCorner = MDCCornerTreatment.cornerWithCut(value);
117116
} else {
118-
shapeScheme.smallComponentShape.bottomRightCorner = MDCCornerTreatment.cornerWithRadius(value);
117+
shapeScheme.mediumComponentShape.bottomRightCorner = MDCCornerTreatment.cornerWithRadius(value);
119118
}
120119
}
121120
private setTopLeftCornerRadius(value: number) {
122121
const shapeScheme = this.getShapeScheme();
123122
const current = shapeScheme.smallComponentShape.topLeftCorner;
124123
if (current instanceof MDCCutCornerTreatment) {
125-
shapeScheme.smallComponentShape.topLeftCorner = MDCCornerTreatment.cornerWithCut(value);
124+
shapeScheme.mediumComponentShape.topLeftCorner = MDCCornerTreatment.cornerWithCut(value);
126125
} else {
127-
shapeScheme.smallComponentShape.topLeftCorner = MDCCornerTreatment.cornerWithRadius(value);
126+
shapeScheme.mediumComponentShape.topLeftCorner = MDCCornerTreatment.cornerWithRadius(value);
128127
}
129128
}
130129
private setTopRightCornerRadius(value: number) {
131130
const shapeScheme = this.getShapeScheme();
132131
const current = shapeScheme.smallComponentShape.topRightCorner;
133132
if (current instanceof MDCCutCornerTreatment) {
134-
shapeScheme.smallComponentShape.topRightCorner = MDCCornerTreatment.cornerWithCut(value);
133+
shapeScheme.mediumComponentShape.topRightCorner = MDCCornerTreatment.cornerWithCut(value);
135134
} else {
136-
shapeScheme.smallComponentShape.topRightCorner = MDCCornerTreatment.cornerWithRadius(value);
135+
shapeScheme.mediumComponentShape.topRightCorner = MDCCornerTreatment.cornerWithRadius(value);
137136
}
138137
}
139138
// trick to get the same behavior as android (don't disable all children)

0 commit comments

Comments
 (0)