Skip to content

Commit

Permalink
feat: add support for google-libphonenumber@3.2.38 and `intl-tel-in…
Browse files Browse the repository at this point in the history 
…put@24.4.0` (#2689)
  • Loading branch information
@Blackbaud-SteveBrush
Blackbaud-SteveBrush committed Sep 12, 2024
1 parent 453e737 commit 0f0329c
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 63 deletions.
2 changes: 1 addition & 1 deletion libs/components/colorpicker/src/lib/modules/colorpicker/colorpicker.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ sky-colorpicker.sky-margin-stacked-lg {
height: 170px;
border: none;
background-size: 100% 100%;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/colorpicker/saturation-lightness.webp);
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/colorpicker/saturation-lightness.webp);
}
.box {
display: flex;
Expand Down
8 changes: 4 additions & 4 deletions libs/components/errors/src/lib/modules/error/error.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@
.sky-error-broken-image {
height: 110px;
width: 170px;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/errors/broken.svg);
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/errors/broken.svg);
}

.sky-error-construction-image {
height: 110px;
width: 109px;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/errors/construction.svg);
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/errors/construction.svg);
}

.sky-error-notfound-image {
height: 110px;
width: 169px;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/errors/notfound.svg);
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/errors/notfound.svg);
}

.sky-error-security-image {
height: 110px;
width: 97px;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/errors/security.svg);
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/errors/security.svg);
}
2 changes: 1 addition & 1 deletion libs/components/lookup/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@skyux/theme": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"intl-tel-input": "23.7.0",
"intl-tel-input": "24.4.0",
"tslib": "^2.6.3"
}
}
58 changes: 26 additions & 32 deletions libs/components/lookup/src/lib/modules/country-field/country-field.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
white-space: nowrap;
}

.sky-country-field-country-btn + ::ng-deep .sky-form-control {
.sky-country-field-country-btn + .sky-form-control {
border-left: none;
}

Expand All @@ -18,7 +18,7 @@

.sky-country-field-search-result-flag {
display: inline-block;
margin-right: $sky-margin-half;
margin-right: 9px;
}

.sky-country-field-flag {
Expand Down Expand Up @@ -75,47 +75,41 @@
@include mixins.sky-field-status(invalid);
}

::ng-deep {
.sky-theme-modern {
.sky-country-field-disabled {
.sky-country-field-flag {
filter: grayscale(100%);
}
.sky-theme-modern {
.sky-country-field-disabled {
.sky-country-field-flag {
filter: grayscale(100%);
}
}

.sky-input-box .sky-form-group {
.sky-country-field-input {
background-color: transparent;
border-radius: $sky-theme-modern-box-border-radius-default;
.sky-input-box .sky-form-group {
.sky-country-field-input {
background-color: transparent;
border-radius: $sky-theme-modern-box-border-radius-default;

textarea.sky-form-control {
@include sky-country-field-textarea;
}
textarea.sky-form-control {
@include sky-country-field-textarea;
}
}

.sky-country-field-input-with-flag {
.sky-country-field-flag {
height: 40px;
left: 15px;
opacity: 1;
}
.sky-country-field-input-with-flag {
.sky-country-field-flag {
height: 40px;
left: 15px;
opacity: 1;
}

.sky-form-control {
padding-left: 45px;
}
.sky-form-control {
padding-left: 45px;
}
}
}
}

.iti__flag {
.sky-country-field-search-result-flag,
.sky-country-field-flag .iti__flag {
max-width: 25px;
max-height: 13px;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/intl-tel-input/flags.webp) !important;

@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.iti__flag {
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/intl-tel-input/flags@2x.webp) !important;
}
}
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/intl-tel-input/flags@2x.webp) !important;
transform: scaleX(1.25) translateX(2px);
}
2 changes: 2 additions & 0 deletions libs/components/lookup/src/lib/modules/country-field/country-field.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
TemplateRef,
Type,
ViewChild,
ViewEncapsulation,
forwardRef,
inject,
} from '@angular/core';
Expand Down Expand Up @@ -57,6 +58,7 @@ let uniqueId = 0;
styleUrls: ['./country-field.component.scss'],
providers: [SKY_COUNTRY_FIELD_VALIDATOR],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
})
export class SkyCountryFieldComponent
implements AfterViewInit, ControlValueAccessor, OnDestroy, OnInit, Validator
Expand Down
4 changes: 2 additions & 2 deletions libs/components/phone-field/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@skyux/theme": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"google-libphonenumber": "3.2.37",
"intl-tel-input": "23.7.0",
"google-libphonenumber": "3.2.38",
"intl-tel-input": "24.4.0",
"tslib": "^2.6.3"
}
}
10 changes: 6 additions & 4 deletions libs/components/phone-field/src/lib/modules/phone-field/phone-field.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
[disabled]="countrySelectDisabled"
(click)="toggleCountrySearch(true)"
>
<div
class="sky-phone-field-flag iti__flag"
[ngClass]="'iti__' + selectedCountry?.iso2"
></div>
<div class="sky-phone-field-flag">
<div
class="iti__flag"
[ngClass]="'iti__' + selectedCountry?.iso2"
></div>
</div>
</button>
</div>
</ng-template>
Expand Down
15 changes: 6 additions & 9 deletions libs/components/phone-field/src/lib/modules/phone-field/phone-field.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,12 @@
}

.sky-phone-field-country-btn {
.iti__flag {
max-width: 25px;
max-height: 13px;
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/intl-tel-input/flags.webp) !important;
.sky-phone-field-flag {
min-width: 20px;
}

@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.iti__flag {
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.3/assets/images/intl-tel-input/flags@2x.webp) !important;
}
}
.iti__flag {
background-image: url(https://sky.blackbaudcdn.net/static/skyux-public-assets/1.0.0-beta.4/assets/images/intl-tel-input/flags@2x.webp) !important;
transform: scaleX(1.25) translateX(2px);
}
}
16 changes: 8 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
"dompurify": "3.1.6",
"dragula": "3.7.3",
"fontfaceobserver": "2.3.0",
"google-libphonenumber": "3.2.37",
"google-libphonenumber": "3.2.38",
"he": "1.2.0",
"intl-tel-input": "23.7.0",
"intl-tel-input": "24.4.0",
"jsonc-parser": "3.3.1",
"moment": "2.30.1",
"ng2-dragula": "5.1.0",
Expand Down

0 comments on commit 0f0329c

Please sign in to comment.