ds-one 0.2.5-alpha.1 → 0.2.5-alpha.11

package/DS1/2-core/ds-cycle.ts

@@ -12,6 +12,7 @@ import type { ThemeType } from "../0-face/theme";
 import { savePreferences } from "../0-face/preferences";
 import "./ds-button";
 import "./ds-icon";
+import "./ds-text";
 
 // Accent color utilities
 const saveAccentColor = (color: string) => {
@@ -19,7 +20,7 @@ const saveAccentColor = (color: string) => {
 };
 
 const getAccentColor = (): string => {
-  return localStorage.getItem("accentColor") || "--blue"; // Default color if none set
+  return localStorage.getItem("accentColor") || "--sharp-blue"; // Default color if none set
 };
 
 const applyAccentColor = () => {
@@ -169,12 +170,12 @@ export class Cycle extends LitElement {
     } else if (this.type === "accent-color") {
       // Set up accent color cycling
       this.values = [
-        "--light-green",
-        "--green",
-        "--light-blue",
-        "--blue",
+        "--apple-green",
+        "--every-green",
+        "--zenith-blue",
+        "--sharp-blue",
         "--pink",
-        "--red",
+        "--tuned-red",
         "--orange",
         "--yellow",
       ];
@@ -185,9 +186,6 @@ export class Cycle extends LitElement {
 
       // Apply the accent color to ensure it's active
       applyAccentColor();
-
-      // Set label
-      this.label = this.getLabel();
     } else if (this.type === "notes-style-medium") {
       // Set up notes style medium cycling
       this.values = ["default", "big", "gallery"];
@@ -271,9 +269,6 @@ export class Cycle extends LitElement {
 
       // Apply the accent color to ensure it's active
       applyAccentColor();
-
-      // Update label
-      this.label = this.getLabel();
     } else if (this.type === "notes-style-medium") {
       // Get current notes style medium
       const currentNotesStyle = getNotesStyleMedium();
@@ -494,8 +489,8 @@ export class Cycle extends LitElement {
     } else if (this.type === "theme") {
       // Try to get translated theme name
       if (this.translationsReady) {
-        const translatedName = translate(`themes.${value}`);
-        if (translatedName && translatedName !== `themes.${value}`) {
+        const translatedName = translate(value);
+        if (translatedName && translatedName !== value) {
           return translatedName;
         }
       }
@@ -533,16 +528,32 @@ export class Cycle extends LitElement {
     return value;
   }
 
+  getColorKey(colorVar: string): string {
+    // Map CSS variables to language keys
+    const colorMap: { [key: string]: string } = {
+      "--tuned-red": "red",
+      "--orange": "orange",
+      "--yellow": "yellow",
+      "--apple-green": "appleGreen",
+      "--every-green": "green",
+      "--zenith-blue": "lightBlue",
+      "--sharp-blue": "blue",
+      "--pink": "pink",
+    };
+
+    return colorMap[colorVar] || colorVar.replace("--", "").replace("-", " ");
+  }
+
   getColorName(colorVar: string): string {
     // Map CSS variables to language keys
     const colorMap: { [key: string]: string } = {
-      "--red": "red",
+      "--tuned-red": "red",
       "--orange": "orange",
       "--yellow": "yellow",
-      "--light-green": "lightGreen",
-      "--green": "green",
-      "--light-blue": "lightBlue",
-      "--blue": "blue",
+      "--apple-green": "appleGreen",
+      "--every-green": "green",
+      "--zenith-blue": "lightBlue",
+      "--sharp-blue": "blue",
       "--pink": "pink",
     };
 
@@ -641,7 +652,25 @@ export class Cycle extends LitElement {
     return html`
       <div class="cycle-container">
         ${this.type !== "icon-only"
-          ? html`<span class="cycle-label">${this.label}</span>`
+          ? html`${this.type === "language"
+              ? html`<ds-text
+                  key="language"
+                  default-value="Language"
+                  class="cycle-label"
+                ></ds-text>`
+              : this.type === "theme"
+                ? html`<ds-text
+                    key="theme"
+                    default-value="Theme"
+                    class="cycle-label"
+                  ></ds-text>`
+                : this.type === "accent-color"
+                  ? html`<ds-text
+                      key="accentColor"
+                      default-value="Accent color"
+                      class="cycle-label"
+                    ></ds-text>`
+                  : html`<span class="cycle-label">${this.label}</span>`}`
           : ""}
         <div
           style="display: flex; align-items: center; ${this.type === "icon-only"
@@ -661,7 +690,24 @@ export class Cycle extends LitElement {
                   style="display: inline-flex; align-items: center; gap: var(--025)"
                   >${this.getValueDisplay(this.currentValue)}</span
                 >`
-              : html`<span>${this.getValueDisplay(this.currentValue)}</span>`}
+              : this.type === "theme"
+                ? html`<ds-text
+                    key=${this.currentValue}
+                    default-value=${this.currentValue}
+                  ></ds-text>`
+                : this.type === "accent-color"
+                  ? html`<ds-text
+                      key=${this.getColorKey(this.currentValue)}
+                      default-value=${this.getColorName(this.currentValue)}
+                    ></ds-text>`
+                  : this.type === "page-style"
+                    ? html`<ds-text
+                        key=${this.currentValue}
+                        default-value=${this.currentValue}
+                      ></ds-text>`
+                    : html`<ds-text
+                        default-value=${this.getValueDisplay(this.currentValue)}
+                      ></ds-text>`}
           </ds-button>
           ${this.type === "accent-color"
             ? html`

package/DS1/2-core/ds-date.ts

@@ -9,7 +9,7 @@ export class DateComponent extends LitElement {
   static styles = css`
     :host {
       display: inline;
-      font-family: var(--typeface, var(--typeface-regular));
+      font-family: var(--typeface-regular, var(--typeface-regular-regular));
       font-size: inherit;
       color: inherit;
     }
@@ -28,4 +28,3 @@ declare global {
     "ds-date": DateComponent;
   }
 }
-

package/DS1/2-core/ds-icon.ts

@@ -26,8 +26,8 @@ export class Icon extends LitElement {
       display: inline-flex;
       justify-content: center;
       align-items: center;
-      width: calc(16px * var(--scaling-factor));
-      height: calc(16px * var(--scaling-factor));
+      width: calc(16px * var(--sf));
+      height: calc(16px * var(--sf));
     }
 
     svg {
@@ -44,8 +44,8 @@ export class Icon extends LitElement {
       display: flex;
       justify-content: center;
       align-items: center;
-      width: calc(16px * var(--scaling-factor));
-      height: calc(16px * var(--scaling-factor));
+      width: calc(16px * var(--sf));
+      height: calc(16px * var(--sf));
     }
 
     /* Notes style color variable for future implementation */

package/DS1/2-core/ds-text.ts

@@ -1,5 +1,5 @@
 import { LitElement, html, css } from "lit";
-import { getText } from "../0-face/i18n";
+import { getText, currentLanguage } from "../0-face/i18n";
 
 /**
  * A component for displaying text from translations
@@ -23,6 +23,7 @@ export class Text extends LitElement {
   declare defaultValue: string;
   declare fallback: string;
   declare _text: string;
+  declare _currentLanguage: string;
   private boundHandlers: { languageChanged: EventListener };
 
   constructor() {
@@ -31,12 +32,15 @@ export class Text extends LitElement {
     this.defaultValue = "";
     this.fallback = "";
     this._text = "";
+    this._currentLanguage = currentLanguage.value;
 
     // Create bound event handlers for proper cleanup
     this.boundHandlers = {
       languageChanged: (() => {
         console.log("Language changed event received in ds-text");
+        this._currentLanguage = currentLanguage.value;
         this._loadText();
+        this.requestUpdate();
       }) as EventListener,
     };
   }
@@ -44,15 +48,25 @@ export class Text extends LitElement {
   static styles = css`
     :host {
       display: inline;
+      font-family: var(--typeface-regular);
+      font-size: calc(var(--type-size-default) * var(--sf));
+      font-weight: var(--type-weight-default);
+      line-height: calc(var(--type-lineheight-default) * var(--sf));
+      letter-spacing: calc(var(--type-letterspacing-default) * var(--sf));
+      text-align: var(--text-align-default);
+      text-transform: var(--text-transform-default);
+      text-decoration: var(--text-decoration-default);
     }
 
-    .loading {
-      opacity: 0.6;
+    :host([data-language="ja"]) {
+      font-family: var(--typeface-regular-jp);
     }
   `;
 
   connectedCallback() {
     super.connectedCallback();
+    this._currentLanguage = currentLanguage.value;
+    this._updateLanguageAttribute();
     this._loadText();
 
     // Listen for language changes
@@ -91,6 +105,15 @@ export class Text extends LitElement {
     }
   }
 
+  _updateLanguageAttribute() {
+    const lang = this._currentLanguage || currentLanguage.value;
+    if (lang === "ja") {
+      this.setAttribute("data-language", "ja");
+    } else {
+      this.removeAttribute("data-language");
+    }
+  }
+
   _loadText() {
     if (!this.key) {
       this._text = this.defaultValue || this.fallback || "";
@@ -104,6 +127,7 @@ export class Text extends LitElement {
       console.error("Error loading text for key:", this.key, error);
       this._text = this.defaultValue || this.fallback || this.key;
     }
+    this._updateLanguageAttribute();
     this.requestUpdate();
   }
 

package/DS1/2-core/ds-tooltip.ts

@@ -1,5 +1,5 @@
 import { LitElement, html, css } from "lit";
-import { translate, getNotionText } from "../0-face/i18n";
+import { translate } from "../0-face/i18n";
 
 export class Tooltip extends LitElement {
   static properties = {
@@ -79,10 +79,10 @@ export class Tooltip extends LitElement {
       position: absolute;
       left: 50%;
       bottom: 100%;
-      transform: translate(-50%, calc(-2px * var(--scaling-factor)));
+      transform: translate(-50%, calc(-2px * var(--sf)));
       z-index: 1000;
       pointer-events: none;
-      height: calc(var(--08) * var(--scaling-factor));
+      height: calc(var(--08) * var(--sf));
       opacity: 0;
       transition:
         opacity 120ms ease,
@@ -91,9 +91,9 @@ export class Tooltip extends LitElement {
       color: light-dark(var(--white), var(--black));
       border-radius: 0;
       font-size: var(--type-size-default);
-      padding: 0px calc(1px * var(--scaling-factor));
+      padding: 0px calc(1px * var(--sf));
       font-family: var(
-        --typeface,
+        --typeface-regular,
         -apple-system,
         BlinkMacSystemFont,
         "Segoe UI",
@@ -152,7 +152,7 @@ export class Tooltip extends LitElement {
     }
   }
 
-  async _loadText(): Promise<void> {
+  _loadText(): void {
     if (!this.key) {
       this._text = this.defaultValue || "";
       this.requestUpdate();
@@ -160,12 +160,6 @@ export class Tooltip extends LitElement {
     }
 
     try {
-      const notionText = await getNotionText(this.key);
-      if (notionText) {
-        this._text = notionText;
-        this.requestUpdate();
-        return;
-      }
       const t = translate(this.key);
       this._text = t && t !== this.key ? t : this.defaultValue || this.key;
     } catch (err) {

package/DS1/3-unit/ds-list.ts

@@ -1,3 +1,10 @@
+// ds-banner.ts
+// Unit component that
+// can be used to show a list of items consiting of compoentnts from core
+
+
+
+
 import { LitElement, html, css } from "lit";
 
 export class List extends LitElement {

package/DS1/3-unit/ds-row.ts

@@ -23,18 +23,18 @@ export class Row extends LitElement {
     :host {
       display: flex;
       align-items: end;
-      width: calc(240px * var(--scaling-factor));
+      width: calc(240px * var(--sf));
     }
 
     :host([type="fill"]) {
       justify-content: space-between;
-      height: calc(var(--1) * var(--scaling-factor));
+      height: calc(var(--1) * var(--sf));
     }
 
     :host([type="centered"]) {
       justify-content: center;
-      height: calc(var(--1) * var(--scaling-factor));
-      gap: calc(var(--025) * var(--scaling-factor));
+      height: calc(var(--1) * var(--sf));
+      gap: calc(var(--025) * var(--sf));
     }
   `;
 
@@ -50,4 +50,3 @@ declare global {
     "ds-row": Row;
   }
 }
-

package/DS1/3-unit/ds-table.ts

@@ -59,8 +59,8 @@ export class DsTable extends LitElement {
       display: flex;
       align-items: center;
       justify-content: left;
-      padding:  0 2px;
-      font-family: var(--typeface);
+      padding: 0 2px;
+      font-family: var(--typeface-regular);
       font-size: var(--type-size-default);
       font-weight: var(--type-weight-default);
       line-height: var(--type-lineheight-default);
@@ -74,10 +74,10 @@ export class DsTable extends LitElement {
       display: flex;
       align-items: center;
       justify-content: left;
-    
+
       outline: 1px solid var(--black);
 
-      font-family: var(--typeface);
+      font-family: var(--typeface-regular);
       font-size: var(--type-size-default);
       font-weight: var(--type-weight-default);
       line-height: var(--type-lineheight-default);
@@ -86,7 +86,7 @@ export class DsTable extends LitElement {
     }
 
     .status-cell {
-      background-color: var(--light-green);
+      background-color: var(--apple-green);
     }
 
     .product-cell {
@@ -117,7 +117,6 @@ export class DsTable extends LitElement {
     return html`
       <div class="table-container">
         <div class="table-header">
-        
           <div class="header-cell product-cell">Product</div>
           <div class="header-cell users-cell">Users</div>
           <div class="header-cell retention-cell">Retention</div>

package/DS1/4-page/ds-grid.ts

@@ -2,7 +2,6 @@
 // Simple grid layout component
 
 import { LitElement, html, css } from "lit";
-import { detectMobileDevice } from "../0-face/device";
 
 declare global {
   interface CustomElementRegistry {
@@ -14,44 +13,9 @@ declare global {
 export class Grid extends LitElement {
   static properties = {
     align: { type: String },
-    _isMobile: { type: Boolean, state: true },
   };
 
   align?: string;
-  _isMobile: boolean = false;
-
-  connectedCallback() {
-    super.connectedCallback();
-    this._isMobile = detectMobileDevice();
-    console.log(`[ds-grid] Mobile device: ${this._isMobile}`);
-
-    // Apply mobile class immediately
-    if (this._isMobile) {
-      this.classList.add("mobile");
-      console.log(`[ds-grid] Mobile class added`);
-    }
-
-    // Calculate mobile grid dimensions to fit screen
-    if (this._isMobile && typeof window !== "undefined") {
-      const screenWidth = window.innerWidth;
-      const columns = 14;
-      const gap = 0.5;
-
-      // Calculate column size accounting for gaps between columns
-      // Total width = (columns * columnSize) + ((columns - 1) * gap)
-      // Therefore: columnSize = (screenWidth - ((columns - 1) * gap)) / columns
-      const totalGapWidth = (columns - 1) * gap;
-      const columnSize = (screenWidth - totalGapWidth) / columns;
-
-      console.log(
-        `[ds-grid] Mobile grid: ${columns} columns × ${columnSize.toFixed(2)}px + ${totalGapWidth}px gaps = ${screenWidth}px`
-      );
-
-      // Set custom property for this grid instance
-      this.style.setProperty("--mobile-column-size", `${columnSize}px`);
-      this.style.setProperty("--mobile-gap", `${gap}px`);
-    }
-  }
 
   static styles = css`
     :host {
@@ -59,17 +23,13 @@ export class Grid extends LitElement {
       margin-left: 0.5px !important;
       display: grid;
       width: 1440px;
-      height: 100%;
+      height: 360px;
       grid-template-columns: repeat(auto-fill, 19px);
       grid-template-rows: repeat(auto-fill, 19px);
       gap: 1px;
-      row-rule: calc(1px * var(--scaling-factor)) solid
-        light-dark(rgb(147, 147, 147), rgb(147, 147, 147));
-      column-rule: calc(1px * var(--scaling-factor)) solid
-        light-dark(rgb(147, 147, 147), rgb(147, 147, 147));
-      outline:
-        1px solid light-dark(rgb(147, 147, 147)),
-        rgb(147, 147, 147);
+      row-rule: calc(1px * var(--sf)) solid var(--grid-color);
+      column-rule: calc(1px * var(--sf)) solid var(--grid-color);
+      outline: 1px solid black;
       position: fixed;
       top: 0;
       left: 50%;
@@ -80,21 +40,20 @@ export class Grid extends LitElement {
 
     /* DO NOT CHANGE THIS GRID CODE FOR MOBILE. ITS PERFECT FOR MOBILE. */
     :host(.mobile) {
-      outline: calc(2px * var(--scaling-factor)) solid rgba(251, 255, 0, 0.9);
-      width: calc(100% - calc(1px * var(--scaling-factor)));
+      width: calc(100% - calc(1px * var(--sf)));
       max-width: 100vw;
       margin-left: 0 !important;
       margin-top: 0 !important;
       box-sizing: border-box;
       position: fixed;
-      top: calc(0.5px * var(--scaling-factor));
+      top: calc(0.5px * var(--sf));
       left: 50%;
       transform: translateX(-50%);
       pointer-events: none;
       z-index: 300;
-      gap: calc(1px * var(--scaling-factor));
-      grid-template-columns: repeat(14, calc(19px * var(--scaling-factor)));
-      grid-template-rows: repeat(auto-fill, calc(19px * var(--scaling-factor)));
+      gap: calc(1px * var(--sf));
+      grid-template-columns: repeat(14, calc(19px * var(--sf)));
+      grid-template-rows: repeat(auto-fill, calc(19px * var(--sf)));
     }
 
     :host([align="left"]) {
@@ -114,15 +73,6 @@ export class Grid extends LitElement {
     }
   `;
 
-  updated() {
-    // Apply mobile class if detected as mobile device
-    if (this._isMobile) {
-      this.classList.add("mobile");
-    } else {
-      this.classList.remove("mobile");
-    }
-  }
-
   render() {
     return html``;
   }