@rdlabo/ionic-theme-ios26 0.0.4 → 0.1.1

package/demo/src/app/index/pages/tabs/tabs.page.html

@@ -0,0 +1,78 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-back-button slot="start" defaultHref="/main/index"></ion-back-button>
+    <ion-title>tabs</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true" color="light">
+  <ion-list [inset]="true">
+    <ion-item-group class="header-item-group">
+      <ion-item>
+        <ion-label>
+          <ion-icon name="logo-ionic" style="background: linear-gradient(#489bfd, #2b77f4)"></ion-icon>
+          <h2>tabs</h2>
+          <ion-header collapse="condense">
+            <ion-toolbar></ion-toolbar>
+          </ion-header>
+          <ion-text><code>This page is a component demo for &#64;rdlabo/ionic-theme-ios26.</code></ion-text>
+        </ion-label>
+      </ion-item>
+    </ion-item-group>
+  </ion-list>
+
+  <ion-tab-bar class="ion-margin-bottom">
+    <ion-tab-button tab="home">
+      <ion-icon name="play-circle"></ion-icon>
+      Listen Now
+    </ion-tab-button>
+    <ion-tab-button tab="radio">
+      <ion-icon name="radio"></ion-icon>
+      Radio
+    </ion-tab-button>
+    <ion-tab-button tab="library">
+      <ion-icon name="library"></ion-icon>
+      Library
+    </ion-tab-button>
+  </ion-tab-bar>
+  <ion-tab-bar class="ion-margin-bottom">
+    <ion-tab-button tab="home">
+      <ion-icon name="play-circle"></ion-icon>
+      Listen Now
+    </ion-tab-button>
+    <ion-tab-button tab="radio">
+      <ion-icon name="radio"></ion-icon>
+      Radio
+    </ion-tab-button>
+    <ion-tab-button tab="library">
+      <ion-icon name="library"></ion-icon>
+      Library
+    </ion-tab-button>
+    <ion-tab-button tab="search">
+      <ion-icon name="search"></ion-icon>
+      Search
+    </ion-tab-button>
+  </ion-tab-bar>
+  <ion-tab-bar class="ion-margin-bottom">
+    <ion-tab-button tab="home">
+      <ion-icon name="play-circle"></ion-icon>
+      Listen Now
+    </ion-tab-button>
+    <ion-tab-button tab="radio">
+      <ion-icon name="radio"></ion-icon>
+      Radio
+    </ion-tab-button>
+    <ion-tab-button tab="library">
+      <ion-icon name="library"></ion-icon>
+      Library
+    </ion-tab-button>
+    <ion-tab-button tab="search">
+      <ion-icon name="search"></ion-icon>
+      Search
+    </ion-tab-button>
+    <ion-tab-button tab="search">
+      <ion-icon name="search"></ion-icon>
+      Last
+    </ion-tab-button>
+  </ion-tab-bar>
+</ion-content>

package/demo/src/app/index/pages/tabs/tabs.page.scss

@@ -0,0 +1,6 @@
+:host {
+  ion-tab-bar {
+    margin-left: calc(16px + var(--ion-safe-area-left, 0px));
+    margin-right: calc(16px + var(--ion-safe-area-right, 0px));
+  }
+}

package/demo/src/app/index/pages/tabs/tabs.page.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TabsPage } from './tabs.page';
+import { testConfig } from '../../../../../util/test.config';
+
+describe('TabsPage', () => {
+  let component: TabsPage;
+  let fixture: ComponentFixture<TabsPage>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: testConfig.providers,
+    }).compileComponents();
+    fixture = TestBed.createComponent(TabsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/demo/src/app/index/pages/tabs/tabs.page.ts

@@ -0,0 +1,47 @@
+import { Component, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import {
+  IonBackButton,
+  IonContent,
+  IonHeader,
+  IonIcon,
+  IonItem,
+  IonItemGroup,
+  IonLabel,
+  IonList,
+  IonTabBar,
+  IonTabButton,
+  IonText,
+  IonTitle,
+  IonToolbar,
+} from '@ionic/angular/standalone';
+
+@Component({
+  selector: 'app-tabs',
+  templateUrl: './tabs.page.html',
+  styleUrls: ['./tabs.page.scss'],
+  standalone: true,
+  imports: [
+    IonContent,
+    IonHeader,
+    IonTitle,
+    IonToolbar,
+    CommonModule,
+    FormsModule,
+    IonBackButton,
+    IonIcon,
+    IonItem,
+    IonItemGroup,
+    IonLabel,
+    IonList,
+    IonText,
+    IonTabBar,
+    IonTabButton,
+  ],
+})
+export class TabsPage implements OnInit {
+  constructor() {}
+
+  ngOnInit() {}
+}

package/demo/src/app/index/pages/toolbar/toolbar.page.html

@@ -0,0 +1,121 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-back-button slot="start" defaultHref="/main/index"></ion-back-button>
+    <ion-title>toolbar</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true" color="light">
+  <ion-list [inset]="true">
+    <ion-item-group class="header-item-group">
+      <ion-item>
+        <ion-label>
+          <ion-icon name="logo-ionic" style="background: linear-gradient(#489bfd, #2b77f4)"></ion-icon>
+          <h2>toolbar</h2>
+          <ion-header collapse="condense">
+            <ion-toolbar></ion-toolbar>
+          </ion-header>
+          <ion-text><code>This page is a component demo for &#64;rdlabo/ionic-theme-ios26.</code></ion-text>
+        </ion-label>
+      </ion-item>
+    </ion-item-group>
+  </ion-list>
+
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-button> Start </ion-button>
+    </ion-buttons>
+    <ion-title>Start / End Buttons</ion-title>
+    <ion-buttons slot="end">
+      <ion-button [disabled]="true"> Disable End </ion-button>
+    </ion-buttons>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-buttons slot="secondary">
+      <ion-button> Secondary </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="primary">
+      <ion-button> Primary </ion-button>
+    </ion-buttons>
+    <ion-title>Primary / Secondary Buttons</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-buttons slot="secondary">
+      <ion-button>
+        <ion-icon slot="icon-only" name="person-circle"></ion-icon>
+      </ion-button>
+      <ion-button>
+        <ion-icon slot="icon-only" name="search"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="primary">
+      <ion-button>
+        <ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>Icon Buttons</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-buttons slot="secondary">
+      <ion-button fill="solid">
+        <ion-icon slot="start" name="person-circle"></ion-icon>
+        Contact
+      </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="primary">
+      <ion-button fill="solid">
+        Help
+        <ion-icon slot="end" name="help-circle"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>Solid Buttons</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-buttons slot="secondary">
+      <ion-button fill="outline">
+        <ion-icon slot="start" name="star"></ion-icon>
+        Star
+      </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="primary">
+      <ion-button fill="outline">
+        Edit
+        <ion-icon slot="end" name="create"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>Outline Buttons</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-back-button default-href="#"></ion-back-button>
+    </ion-buttons>
+    <ion-title>Back Button</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-menu-button auto-hide="false"></ion-menu-button>
+    </ion-buttons>
+    <ion-title>Menu Button</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-searchbar></ion-searchbar>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-segment [value]="'all'">
+      <ion-segment-button [value]="'all'">
+        <ion-label>All</ion-label>
+      </ion-segment-button>
+      <ion-segment-button [value]="'favorites'">
+        <ion-label>Favorites</ion-label>
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-content>

package/demo/src/app/index/pages/toolbar/toolbar.page.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ToolbarPage } from './toolbar.page';
+import { testConfig } from '../../../../../util/test.config';
+
+describe('ToolbarPage', () => {
+  let component: ToolbarPage;
+  let fixture: ComponentFixture<ToolbarPage>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: testConfig.providers,
+    }).compileComponents();
+    fixture = TestBed.createComponent(ToolbarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/demo/src/app/index/pages/toolbar/toolbar.page.ts

@@ -0,0 +1,55 @@
+import { Component, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import {
+  IonBackButton,
+  IonButton,
+  IonButtons,
+  IonContent,
+  IonHeader,
+  IonIcon,
+  IonItem,
+  IonItemGroup,
+  IonLabel,
+  IonList,
+  IonMenuButton,
+  IonSearchbar,
+  IonSegment,
+  IonSegmentButton,
+  IonText,
+  IonTitle,
+  IonToolbar,
+} from '@ionic/angular/standalone';
+
+@Component({
+  selector: 'app-toolbar',
+  templateUrl: './toolbar.page.html',
+  styleUrls: ['./toolbar.page.scss'],
+  standalone: true,
+  imports: [
+    IonContent,
+    IonHeader,
+    IonTitle,
+    IonToolbar,
+    CommonModule,
+    FormsModule,
+    IonBackButton,
+    IonIcon,
+    IonItem,
+    IonItemGroup,
+    IonLabel,
+    IonList,
+    IonText,
+    IonButtons,
+    IonButton,
+    IonMenuButton,
+    IonSearchbar,
+    IonSegment,
+    IonSegmentButton,
+  ],
+})
+export class ToolbarPage implements OnInit {
+  constructor() {}
+
+  ngOnInit() {}
+}

package/demo/src/app/tabs/tabs.page.scss

@@ -1,9 +0,0 @@
-ion-label {
-  margin-bottom: 4px;
-}
-
-ion-tab-bar {
-  &.tab-bar-hide {
-    display: none;
-  }
-}

package/demo/src/app/tabs/tabs.page.ts

@@ -19,9 +19,9 @@ export class TabsPage implements OnInit {
         return;
       }
       if (['/main/settings'].includes(params.urlAfterRedirects)) {
-        tabBar.classList.add('tab-bar-hide');
+        tabBar.classList.add('tab-bar-hidden');
       } else if (tabBar) {
-        tabBar.classList.remove('tab-bar-hide');
+        tabBar.classList.remove('tab-bar-hidden');
       }
     });
   }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@rdlabo/ionic-theme-ios26",
-  "version": "0.0.4",
+  "version": "0.1.1",
   "description": "iOS26 CSS Theme for Ionic Framework",
   "exports": {
     "./src/*": {
       "style": "./src/*"
     },
-    "./css/*": {
-      "style": "./css/*"
+    "./dist/*": {
+      "style": "./dist/*"
     },
     "./package.json": {
       "default": "./package.json"

package/src/components/ion-action-sheet.scss

@@ -11,6 +11,10 @@ ion-action-sheet.ios:not(.ios26-disabled) {
     margin: 0 8px 8px;
     border-radius: 32px;
 
+    .action-sheet-title,
+    .action-sheet-has-sub-title {
+      background: none;
+    }
     .action-sheet-title {
       padding-top: 8px;
     }

package/src/components/ion-alert.scss

@@ -12,7 +12,6 @@ ion-alert.ios:not(.ios26-disabled) {
     .alert-head,
     .alert-message {
       text-align: left;
-      padding: 12px 20px;
     }
 
     .alert-radio-group {

package/src/components/ion-button.scss

@@ -9,6 +9,10 @@
   @include api.glass-background;
   border-radius: 25px;
   overflow: hidden;
+
+  /**
+   * compare .header-collapse-main ion-toolbar.in-toolbar ion-title, .header-collapse-main ion-toolbar.in-toolbar ion-buttons
+   */
   transition: transform 100ms ease-out !important;
 
   &:has(.ion-activated) {
@@ -18,7 +22,10 @@
   ion-button:not(.ios26-disabled),
   ion-back-button:not(.ios26-disabled) {
     transform: none;
-    opacity: 1;
+
+    &:not(.button-disabled) {
+      opacity: 1;
+    }
 
     &.ion-activated {
       --color: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.1);
@@ -29,7 +36,8 @@
 
     &::part(native) {
       /**
-       * TODO: remove !important.
+       * overwrite theme-button mixin.
+       * ex) ion-button.ios:not(.ios26-disabled):not(.button-solid):not(.ios26-button-solid):not(.button-outline):not(.ios26-button-outline):not(.button-clear):not(.ios26-button-clear)::part(native)
        */
       box-shadow: none !important;
       border: none !important;
@@ -73,9 +81,11 @@
     }
   }
 
-  --border-radius: 24px !important;
-  &.button-large {
-    --border-radius: 30px !important;
+  &:not(.button-round) {
+    --border-radius: 24px;
+    &.button-large {
+      --border-radius: 30px;
+    }
   }
 
   &:not(.button-clear):not(.ios26-button-clear) {
@@ -99,7 +109,10 @@
     &::part(native) {
       @include api.glass-background;
     }
-    opacity: 1; // for ion-back-button
+
+    &:not(.button-disabled) {
+      opacity: 1; // for ion-back-button
+    }
 
     --color: rgba(var(--ion-text-color-rgb, 0, 0, 0), 1);
     &.ion-color {

package/src/components/ion-datetime.scss

@@ -4,6 +4,6 @@ ion-datetime.ios:not(.ios26-disabled) {
   @include api.glass-background;
   border-radius: 24px;
 
-  --wheel-highlight-background: transparent !important;
-  --wheel-highlight-border-radius: 24px !important;
+  --wheel-highlight-background: transparent;
+  --wheel-highlight-border-radius: 24px;
 }

package/src/components/ion-list.scss

@@ -3,12 +3,14 @@
 ion-list.list-inset.ios:not(.ios26-disabled) {
   @include theme-list-inset.ion-list-inset();
 
-  ion-radio-group {
+  ion-radio-group,
+  ion-reorder-group {
     display: block;
   }
 
   ion-item-group,
   ion-reorder-group,
+  ion-accordion-group,
   ion-radio-group {
     border-radius: 24px;
     overflow: hidden;

package/src/components/ion-modal.scss

@@ -3,8 +3,8 @@
 ion-modal.ios:not(.ios26-disabled) {
   --backdrop-opacity: 0.2;
   ion-toolbar {
-    padding-right: calc(var(--ion-safe-area-right) + 4px) !important;
-    padding-left: calc(var(--ion-safe-area-left) + 4px) !important;
+    padding-right: calc(var(--ion-safe-area-right) + 4px);
+    padding-left: calc(var(--ion-safe-area-left) + 4px);
   }
   &::part(handle) {
     width: 80px;

package/src/components/ion-searchbar.scss

@@ -3,7 +3,6 @@
 ion-modal.ios {
   ion-searchbar:not(.ios26-disabled) {
     .searchbar-input-container {
-      margin: 0 6px;
       input.searchbar-input {
         // Modal表示でのアイコン非表示の不具合の対応
         backdrop-filter: none;
@@ -28,10 +27,10 @@ ion-searchbar.ios:not(.ios26-disabled) {
       min-height: 44px;
       @include api.glass-background;
       border-radius: 20px;
-      padding-inline-start: 2.4rem !important;
+      padding-inline-start: 2.4rem;
     }
     .searchbar-clear-button {
-      padding-inline-end: 2rem !important;
+      padding-inline-end: 2rem;
     }
   }
 }

package/src/components/ion-tabs.scss

@@ -6,13 +6,28 @@ ion-tab-bar.ios:not(.ios26-disabled) {
 
   border-radius: 40px;
 
-  width: calc(100% - 56px - 16px - 16px - 4px - 16px);
-  max-width: 400px;
+  &[slot='top'] {
+    position: absolute;
+    top: var(--ios26-floating-safe-area-top);
+    right: calc(16px + var(--ion-safe-area-right, 0px));
+  }
+
+  &[slot='bottom'] {
+    position: absolute;
+    bottom: var(--ios26-floating-safe-area-bottom);
+    left: calc(16px + var(--ion-safe-area-left, 0px));
+  }
+
+  /**
+   * 100% - margin-left - margin-right - right-fab - margin-right-fab
+   */
+  width: calc(100% - calc(18px + var(--ion-safe-area-left, 0px)) - calc(18px + var(--ion-safe-area-left, 0px)) - 54px - 18px);
+  max-width: 474px;
+  &:has(:nth-child(5)) {
+    width: calc(100% - calc(18px + var(--ion-safe-area-left, 0px)) - calc(18px + var(--ion-safe-area-left, 0px)));
+    max-width: 546px;
+  }
   padding: 2px 2px;
-  bottom: var(--ios26-floating-safe-area-bottom);
-  left: calc(16px + var(--ion-safe-area-left, 0px));
-  position: absolute;
-  margin: auto;
 
   transition: transform 100ms ease-out;
   will-change: transform;
@@ -23,12 +38,13 @@ ion-tab-bar.ios:not(.ios26-disabled) {
 
   ion-tab-button {
     & > ion-icon {
-      font-size: 30px;
+      font-size: 28px;
     }
     background: rgba(var(--ios26-color-light-rgb), 0);
     height: auto;
     &::part(native) {
       overflow: visible;
+      padding: 2px;
     }
 
     &.tab-selected {

package/src/default-variables.scss

@@ -1,5 +1,7 @@
 :root {
+  --ios26-floating-safe-area-top: max(10px, var(--ion-safe-area-top, 0px));
   --ios26-floating-safe-area-bottom: max(10px, var(--ion-safe-area-bottom, 0px));
+
   --ios26-content-box-shadow-opacity: 0.8;
 
   --ios26-color-dark-rgb: 0, 0, 0;

package/src/ionic-theme-ios26.scss

@@ -16,7 +16,6 @@
 @use 'components/ion-popover';
 @use 'components/ion-range';
 @use 'components/ion-searchbar';
-@use 'components/ion-segment';
 @use 'components/ion-tabs';
 @use 'components/ion-toast';
 @use 'components/ion-toggle';

package/src/utils/theme-list-inset.scss

@@ -57,6 +57,7 @@
 
   ion-item-group,
   ion-reorder-group,
+  ion-accordion-group,
   ion-radio-group {
     ion-item {
       ion-text[slot='end'] {

package/src/utils/translucent.scss

@@ -25,8 +25,7 @@ ion-footer.ios:not(.ios26-disabled).footer-translucent {
   }
 }
 
-ion-header.ios:not(.ios26-disabled).header-collapse-main ion-toolbar.in-toolbar ion-title,
-ion-header.ios:not(.ios26-disabled).header-collapse-main ion-toolbar.in-toolbar ion-buttons {
+ion-header.ios:not(.ios26-disabled).header-collapse-main ion-toolbar.in-toolbar ion-title {
   transition: all 0.5s ease-in-out;
 }
 
@@ -62,7 +61,7 @@ ion-content::part(background)::after {
   z-index: 2;
   bottom: 0;
   height: calc(56px + var(--ios26-floating-safe-area-bottom));
-  box-shadow: inset 0 calc(-55px - var(--ios26-floating-safe-area-bottom)) 16px -16px
+  box-shadow: inset 0 calc(-56px - var(--ios26-floating-safe-area-bottom)) 16px -16px
     rgba(var(--ios26-color-background-rgb), var(--ios26-content-box-shadow-opacity));
 }