javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 15:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): update next with latest from main branch

Browse Source
This commit is contained in:
Liam DeBeasi
2021-02-01 15:57:57 -05:00
committed by GitHub
parent 6f2cbe6e59 1a5accc5f7
commit bfbc1f5420
39 changed files with 343 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "@ionic/core",
"version": "5.5.2",
"version": "5.5.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/core",
"version": "5.5.2",
"version": "5.5.3",
"license": "MIT",
"dependencies": {
"ionicons": "^5.1.2",
@ -17,7 +17,7 @@
"@rollup/plugin-virtual": "^2.0.3",
"@stencil/core": "2.1.2",
"@stencil/sass": "1.3.2",
"@stencil/vue-output-target": "0.2.2",
"@stencil/vue-output-target": "0.2.5",
"@types/jest": "^26.0.10",
"@types/node": "^14.6.0",
"@types/puppeteer": "3.0.1",
@ -1657,10 +1657,13 @@
"dev": true
},
"node_modules/@stencil/vue-output-target": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.2.2.tgz",
"integrity": "sha512-WBnN/8ggIVYgKbJOML1DVzjFnKv7RaQpTa+XNeY0r/EG6MbXlUjUC/4Cpkg5wQ94WNuPpphAR4oRWGsmiQDxPQ==",
"dev": true
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.2.5.tgz",
"integrity": "sha512-EnCZbJDD7y2nTnaFXo4PJrEgP9CNvJARZQrnvz93rMDKCzm+19C9goU4D6A1ysblLVvZSTm3wELKSM1auRUm0Q==",
"dev": true,
"peerDependencies": {
"@stencil/core": ">=1.8.0"
}
},
"node_modules/@stylelint/postcss-css-in-js": {
"version": "0.37.2",
@ -16387,9 +16390,9 @@
"dev": true
},
"@stencil/vue-output-target": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.2.2.tgz",
"integrity": "sha512-WBnN/8ggIVYgKbJOML1DVzjFnKv7RaQpTa+XNeY0r/EG6MbXlUjUC/4Cpkg5wQ94WNuPpphAR4oRWGsmiQDxPQ==",
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.2.5.tgz",
"integrity": "sha512-EnCZbJDD7y2nTnaFXo4PJrEgP9CNvJARZQrnvz93rMDKCzm+19C9goU4D6A1ysblLVvZSTm3wELKSM1auRUm0Q==",
"dev": true
},
"@stylelint/postcss-css-in-js": {

4
core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/core",
"version": "5.5.2",
"version": "5.5.3",
"description": "Base components for Ionic",
"keywords": [
"ionic",
@ -38,7 +38,7 @@
"@rollup/plugin-virtual": "^2.0.3",
"@stencil/core": "2.1.2",
"@stencil/sass": "1.3.2",
"@stencil/vue-output-target": "0.2.2",
"@stencil/vue-output-target": "0.2.5",
"@types/jest": "^26.0.10",
"@types/node": "^14.6.0",
"@types/puppeteer": "3.0.1",

4
core/src/components/refresher/refresher.utils.ts
View File

@ -172,8 +172,8 @@ export const shouldUseNativeRefresher = async (referenceEl: HTMLIonRefresherElem
await refresherContent.componentOnReady();
const pullingSpinner = refresherContent.querySelector('.refresher-pulling ion-spinner');
const refreshingSpinner = refresherContent.querySelector('.refresher-refreshing ion-spinner');
const pullingSpinner = referenceEl.querySelector('ion-refresher-content .refresher-pulling ion-spinner');
const refreshingSpinner = referenceEl.querySelector('ion-refresher-content .refresher-refreshing ion-spinner');
return (
pullingSpinner !== null &&

6
core/src/components/refresher/test/basic/index.html
View File

@ -21,7 +21,11 @@
<ion-content>
<ion-refresher id="refresher" slot="fixed">
<ion-refresher-content pulling-text="Pull to refresh..." refreshing-text="Refreshing...">
<ion-refresher-content
pulling-icon="arrow-down-outline"
pulling-text="Pull to refresh..."
refreshing-text="Refreshing..."
refreshing-spinner="circles">
</ion-refresher-content>
</ion-refresher>

1
core/src/components/select/select.tsx
View File

@ -473,6 +473,7 @@ export class Select implements ComponentInterface {
[mode]: true,
'in-item': hostContext('ion-item', el),
'select-disabled': disabled,
'select-expanded': isExpanded
}}
>
<div aria-hidden="true" class={selectTextClasses} part={textPart}>

10
core/src/utils/input-shims/hacks/scroll-assist.ts
View File

@ -1,4 +1,4 @@
import { pointerCoord } from '../../helpers';
import { pointerCoord, raf } from '../../helpers';
import { isFocused, relocateInput } from './common';
import { getScrollData } from './scroll-data';
@ -26,7 +26,6 @@ export const enableScrollAssist = (
// focus this input if the pointer hasn't moved XX pixels
// and the input doesn't already have focus
if (!hasPointerMoved(6, coord, endCoord) && !isFocused(inputEl)) {
ev.preventDefault();
ev.stopPropagation();
// begin the input focus process
@ -65,6 +64,13 @@ const jsSetFocus = async (
relocateInput(componentEl, inputEl, true, scrollData.inputSafeY);
inputEl.focus();
/**
* Relocating/Focusing input causes the
* click event to be cancelled, so
* manually fire one here.
*/
raf(() => componentEl.click());
/* tslint:disable-next-line */
if (typeof window !== 'undefined') {
let scrollContentTimeout: any;

2
core/src/utils/transition/ios.transition.ts
View File

@ -14,7 +14,7 @@ export const shadow = <T extends Element>(el: T): ShadowRoot | T => {
const getLargeTitle = (refEl: any) => {
const tabs = (refEl.tagName === 'ION-TABS') ? refEl : refEl.querySelector('ion-tabs');
const query = 'ion-header:not(.header-collapse-condense-inactive) ion-title.title-large';
const query = 'ion-content ion-header:not(.header-collapse-condense-inactive) ion-title.title-large';
if (tabs != null) {
const activeTab = tabs.querySelector('ion-tab:not(.tab-hidden), .ion-page:not(.ion-page-hidden)');

7
core/stencil.config.ts
View File

@ -87,13 +87,6 @@ export const config: Config = {
'ion-app',
'ion-icon'
],
routerLinkComponents: [
'ion-card',
'ion-item',
'ion-button',
'ion-fab-button',
],
componentModels: [
{
elements: ['ion-checkbox', 'ion-toggle'],