Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions core/api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,6 @@ ion-content,prop,mode,"ios" | "md",undefined,false,false
ion-content,prop,scrollEvents,boolean,false,false,false
ion-content,prop,scrollX,boolean,false,false,false
ion-content,prop,scrollY,boolean,true,false,false
ion-content,prop,theme,"ios" | "md" | "ionic",undefined,false,false
ion-content,method,getScrollElement,getScrollElement() => Promise<HTMLElement>
ion-content,method,scrollByPoint,scrollByPoint(x: number, y: number, duration: number) => Promise<void>
ion-content,method,scrollToBottom,scrollToBottom(duration?: number) => Promise<void>
Expand All @@ -758,15 +757,14 @@ ion-content,method,scrollToTop,scrollToTop(duration?: number) => Promise<void>
ion-content,event,ionScroll,ScrollDetail,true
ion-content,event,ionScrollEnd,ScrollBaseDetail,true
ion-content,event,ionScrollStart,ScrollBaseDetail,true
ion-content,css-prop,--background
ion-content,css-prop,--color
ion-content,css-prop,--keyboard-offset
ion-content,css-prop,--offset-bottom
ion-content,css-prop,--offset-top
ion-content,css-prop,--padding-bottom
ion-content,css-prop,--padding-end
ion-content,css-prop,--padding-start
ion-content,css-prop,--padding-top
ion-content,css-prop,--ion-content-background
ion-content,css-prop,--ion-content-color
ion-content,css-prop,--ion-content-font-family
ion-content,css-prop,--ion-content-overflow
ion-content,css-prop,--ion-content-padding-bottom
ion-content,css-prop,--ion-content-padding-end
ion-content,css-prop,--ion-content-padding-start
ion-content,css-prop,--ion-content-padding-top
ion-content,part,background
ion-content,part,scroll

Expand Down
12 changes: 2 additions & 10 deletions core/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { RouteID, RouterDirection, RouterEventDetail, RouteWrite } from "./compo
import { BreadcrumbCollapsedClickEventDetail } from "./components/breadcrumb/breadcrumb-interface";
import { CheckboxChangeEventDetail } from "./components/checkbox/checkbox-interface";
import { IonChipFill, IonChipHue, IonChipShape, IonChipSize } from "./components/chip/chip.interfaces";
import { ScrollBaseDetail, ScrollDetail } from "./components/content/content-interface";
import { ScrollBaseDetail, ScrollDetail } from "./components/content/content.interfaces";
import { DatetimeChangeEventDetail, DatetimeHighlight, DatetimeHighlightCallback, DatetimeHourCycle, DatetimePresentation, FormatOptions, TitleSelectedDatesFormatter } from "./components/datetime/datetime-interface";
import { SpinnerTypes } from "./components/spinner/spinner-configs";
import { InputChangeEventDetail, InputInputEventDetail } from "./components/input/input-interface";
Expand Down Expand Up @@ -55,7 +55,7 @@ export { RouteID, RouterDirection, RouterEventDetail, RouteWrite } from "./compo
export { BreadcrumbCollapsedClickEventDetail } from "./components/breadcrumb/breadcrumb-interface";
export { CheckboxChangeEventDetail } from "./components/checkbox/checkbox-interface";
export { IonChipFill, IonChipHue, IonChipShape, IonChipSize } from "./components/chip/chip.interfaces";
export { ScrollBaseDetail, ScrollDetail } from "./components/content/content-interface";
export { ScrollBaseDetail, ScrollDetail } from "./components/content/content.interfaces";
export { DatetimeChangeEventDetail, DatetimeHighlight, DatetimeHighlightCallback, DatetimeHourCycle, DatetimePresentation, FormatOptions, TitleSelectedDatesFormatter } from "./components/datetime/datetime-interface";
export { SpinnerTypes } from "./components/spinner/spinner-configs";
export { InputChangeEventDetail, InputInputEventDetail } from "./components/input/input-interface";
Expand Down Expand Up @@ -1118,10 +1118,6 @@ export namespace Components {
* @default true
*/
"scrollY": boolean;
/**
* The theme determines the visual appearance of the component.
*/
"theme"?: "ios" | "md" | "ionic";
}
interface IonDatetime {
/**
Expand Down Expand Up @@ -7060,10 +7056,6 @@ declare namespace LocalJSX {
* @default true
*/
"scrollY"?: boolean;
/**
* The theme determines the visual appearance of the component.
*/
"theme"?: "ios" | "md" | "ionic";
}
interface IonDatetime {
/**
Expand Down
1 change: 0 additions & 1 deletion core/src/components/action-sheet/action-sheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
flex-shrink: 2;
overscroll-behavior-y: contain;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-webkit-overflow-scrolling has become obsolete since iOS 13.

pointer-events: all;

background: var(--background);
Expand Down
20 changes: 19 additions & 1 deletion core/src/components/action-sheet/test/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<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>
Expand All @@ -26,7 +44,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<button class="expand" id="basic" onclick="presentBasic()">Basic</button>
<button class="expand" id="alertFromActionSheet" onclick="presentAlert()">Alert from Action Sheet</button>
<button class="expand" id="cancelOnly" onclick="presentCancelOnly()">Cancel Only</button>
Expand Down
20 changes: 19 additions & 1 deletion core/src/components/action-sheet/test/is-open/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<script src="../../../../../scripts/testing/scripts.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
<style>
Expand Down Expand Up @@ -43,7 +61,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<div class="grid">
<div class="grid-item">
<h2>Default</h2>
Expand Down
20 changes: 19 additions & 1 deletion core/src/components/action-sheet/test/translucent/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<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>
Expand Down Expand Up @@ -69,7 +87,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<button class="expand" id="basic" onclick="presentBasic()">Basic</button>
<button class="expand" id="noBackdropDismiss" onclick="presentNoBackdropDismiss()">No Backdrop Dismiss</button>
<button class="expand" id="alertFromActionSheet" onclick="presentAlert()">Alert from Action Sheet</button>
Expand Down
20 changes: 19 additions & 1 deletion core/src/components/action-sheet/test/trigger/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<script src="../../../../../scripts/testing/scripts.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
<style>
Expand Down Expand Up @@ -43,7 +61,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<div class="grid">
<div class="grid-item">
<h2>Default</h2>
Expand Down
1 change: 0 additions & 1 deletion core/src/components/alert/alert.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@

border-top: $alert-ios-list-border-top;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

.alert-tappable {
Expand Down
1 change: 0 additions & 1 deletion core/src/components/alert/alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
.alert-message,
.alert-input-group {
box-sizing: border-box;
-webkit-overflow-scrolling: touch;
overflow-y: auto;
overscroll-behavior-y: contain;
}
Expand Down
14 changes: 13 additions & 1 deletion core/src/components/alert/test/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<button class="expand" class="custom-accordion-button" id="basic" onclick="presentAlert()">Alert</button>
<button class="expand" id="longMessage" onclick="presentAlertLongMessage()">Alert Long Message</button>
<button class="expand" id="multipleButtons" onclick="presentAlertMultipleButtons()">
Expand Down Expand Up @@ -59,6 +59,18 @@
window.Ionic = {
config: {
innerHTMLTemplatesEnabled: true,
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};

Expand Down
20 changes: 19 additions & 1 deletion core/src/components/alert/test/is-open/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<script src="../../../../../scripts/testing/scripts.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
</head>
Expand All @@ -21,7 +39,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<button class="expand" id="default" onclick="openAlert()">Open Alert</button>
<button class="expand" id="timeout" onclick="openAlert(500)">Open Alert, Close After 500ms</button>

Expand Down
20 changes: 19 additions & 1 deletion core/src/components/alert/test/translucent/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<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>
Expand Down Expand Up @@ -82,7 +100,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<button class="expand blue" onclick="presentAlert()">Alert</button>
<button class="expand light-blue" onclick="presentAlertLongMessage()">Alert Long Message</button>
<button class="expand red" onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</button>
Expand Down
20 changes: 19 additions & 1 deletion core/src/components/alert/test/trigger/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<script src="../../../../../scripts/testing/scripts.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
</head>
Expand All @@ -21,7 +39,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ion-content>
<button id="default">Open Alert</button>
<button id="timeout">Open Alert, Close After 500ms</button>

Expand Down
20 changes: 19 additions & 1 deletion core/src/components/avatar/test/shape/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
/>
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet" />
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet" />
<script>
window.Ionic = {
config: {
customTheme: {
components: {
IonContent: {
padding: {
start: '16px',
end: '16px',
top: '16px',
bottom: '16px',
},
},
},
},
},
};
</script>
<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>
Expand All @@ -29,7 +47,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding" id="content" no-bounce>
<ion-content id="content" no-bounce>
<h2>Default</h2>
<div class="container">
<ion-avatar>AB</ion-avatar>
Expand Down
Loading
Loading