@ecohouse/ui 0.1.58 → 0.1.60

package/src/icons/GoogleBrand/GoogleBrandIcon.test.ts

@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+import { GOOGLE_BRAND_PATHS } from "./googleBrandPaths";
+
+describe("GoogleBrandIcon", () => {
+  it("uses the approved brand-colored paths", () => {
+    expect(GOOGLE_BRAND_PATHS).toHaveLength(4);
+    expect(GOOGLE_BRAND_PATHS.map((path) => path.fill)).toEqual([
+      "#4285F4",
+      "#34A853",
+      "#FBBC05",
+      "#A63E3E",
+    ]);
+  });
+});

package/src/icons/GoogleBrand/GoogleBrandIcon.tsx

@@ -0,0 +1,15 @@
+import Svg, { Path } from "react-native-svg";
+import type { IconProps } from "../types";
+import { GOOGLE_BRAND_PATHS } from "./googleBrandPaths";
+
+export { GOOGLE_BRAND_PATHS } from "./googleBrandPaths";
+
+export function GoogleBrandIcon({ size = 18 }: IconProps) {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 18 18" fill="none">
+      {GOOGLE_BRAND_PATHS.map((path) => (
+        <Path key={path.fill} clipRule="evenodd" d={path.d} fill={path.fill} fillRule="evenodd" />
+      ))}
+    </Svg>
+  );
+}

package/src/icons/GoogleBrand/GoogleBrandIcon.web.tsx

@@ -0,0 +1,21 @@
+import type { IconProps } from "../types";
+import { GOOGLE_BRAND_PATHS } from "./googleBrandPaths";
+
+export function GoogleBrandIcon({ size = 18 }: IconProps) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 18 18"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden
+    >
+      {GOOGLE_BRAND_PATHS.map((path) => (
+        <path key={path.fill} clipRule="evenodd" d={path.d} fill={path.fill} fillRule="evenodd" />
+      ))}
+    </svg>
+  );
+}
+
+export { GOOGLE_BRAND_PATHS } from "./googleBrandPaths";

package/src/icons/GoogleBrand/googleBrandPaths.ts

@@ -0,0 +1,18 @@
+export const GOOGLE_BRAND_PATHS = [
+  {
+    d: "M17.64 9.20456C17.64 8.56637 17.5827 7.95274 17.4764 7.36365H9V10.845H13.8436C13.635 11.97 13.0009 12.9232 12.0477 13.5614V15.8196H14.9564C16.6582 14.2527 17.64 11.9455 17.64 9.20456Z",
+    fill: "#4285F4",
+  },
+  {
+    d: "M9.00366 18C11.4337 18 13.4709 17.1941 14.96 15.8195L12.0514 13.5613C11.2455 14.1013 10.2146 14.4204 9.00366 14.4204C6.65957 14.4204 4.67548 12.8372 3.96776 10.71H0.960938V13.0418C2.44185 15.9831 5.48548 18 9.00366 18Z",
+    fill: "#34A853",
+  },
+  {
+    d: "M3.96409 10.7099C3.78409 10.1699 3.68182 9.59313 3.68182 8.99995C3.68182 8.40677 3.78409 7.82995 3.96409 7.28995V4.95813H0.957273C0.347727 6.17313 0 7.54768 0 8.99995C0 10.4522 0.347727 11.8268 0.957273 13.0418L3.96409 10.7099Z",
+    fill: "#FBBC05",
+  },
+  {
+    d: "M9.00366 3.57955C10.325 3.57955 11.5114 4.03364 12.4441 4.92545L15.0255 2.34409C13.4668 0.891818 11.4296 0 9.00366 0C5.48548 0 2.44185 2.01682 0.960938 4.95818L3.96776 7.29C4.67548 5.16273 6.65957 3.57955 9.00366 3.57955Z",
+    fill: "#A63E3E",
+  },
+] as const;

package/src/icons/GoogleBrand/index.ts

@@ -0,0 +1 @@
+export { GoogleBrandIcon, GOOGLE_BRAND_PATHS } from "./GoogleBrandIcon";

package/src/icons/index.ts

@@ -12,6 +12,7 @@ export { AlertTriangleIcon } from "./AlertTriangle";
 export { AppleIcon } from "./Store";
 export { ArrowLeftIcon } from "./ArrowLeft";
 export { ArrowRightIcon } from "./ArrowRight";
+export { BackspaceIcon } from "./Backspace";
 export { BagIcon } from "./Bag";
 export { BanIcon } from "./Ban";
 export { BlockedGuestsIcon } from "./BlockedGuests";
@@ -59,6 +60,7 @@ export {
 export { QuietHoursIcon, NoSmokingIcon, PawIcon, TrashIcon } from "./HouseRules";
 export { FacebookIcon } from "./Facebook";
 export { FiltersIcon } from "./Filters";
+export { FingerprintIcon } from "./Fingerprint";
 export { FullscreenIcon } from "./Fullscreen";
 export { CutleryIcon } from "./Cutlery";
 export { DollarIcon } from "./Dollar";
@@ -68,6 +70,7 @@ export { DoubleCheckIcon } from "./DoubleCheck";
 export { HeartIcon } from "./Heart";
 export { HeadsetIcon } from "./Headset";
 export { GlobeIcon } from "./Globe";
+export { GoogleBrandIcon } from "./GoogleBrand";
 export { GooglePlayIcon } from "./Store";
 export { HelpCircleIcon } from "./HelpCircle";
 export { HideIcon } from "./Hide";

package/src/icons/registry.ts

@@ -2,6 +2,7 @@ import { ActiveGuestsIcon } from "./ActiveGuests";
 import { ArrowRightIcon } from "./ArrowRight";
 import { AlertTriangleIcon } from "./AlertTriangle";
 import { AppleIcon, GooglePlayIcon } from "./Store";
+import { BackspaceIcon } from "./Backspace";
 import { BagIcon } from "./Bag";
 import { BanIcon } from "./Ban";
 import { BlockedGuestsIcon } from "./BlockedGuests";
@@ -47,6 +48,8 @@ import {
 } from "./CottageDetail";
 import { NoSmokingIcon, PawIcon, QuietHoursIcon, TrashIcon } from "./HouseRules";
 import { FacebookIcon } from "./Facebook";
+import { FingerprintIcon } from "./Fingerprint";
+import { GoogleBrandIcon } from "./GoogleBrand";
 import { FiltersIcon } from "./Filters";
 import { FullscreenIcon } from "./Fullscreen";
 import { CutleryIcon } from "./Cutlery";
@@ -118,6 +121,7 @@ export const icons = {
   areaExpand: AreaExpandIcon,
   apple: AppleIcon,
   arrowRight: ArrowRightIcon,
+  backspace: BackspaceIcon,
   bag: BagIcon,
   ban: BanIcon,
   blockedGuests: BlockedGuestsIcon,
@@ -148,6 +152,8 @@ export const icons = {
   bedrooms: BedroomsIcon,
   cardLocation: CardLocationIcon,
   facebook: FacebookIcon,
+  fingerprint: FingerprintIcon,
+  googleBrand: GoogleBrandIcon,
   filters: FiltersIcon,
   fullscreen: FullscreenIcon,
   guests: GuestsIcon,
@@ -282,6 +288,8 @@ export const iconGroups = {
     "smartKey",
     "stayHome",
     "filters",
+    "backspace",
+    "fingerprint",
     "fullscreen",
     "heart",
     "headset",
@@ -333,7 +341,7 @@ export const iconGroups = {
     "notificationQrCode",
     "notificationWarning",
   ],
-  social: ["apple", "facebook", "googlePlay", "instagram", "linkedin"],
+  social: ["apple", "facebook", "googleBrand", "googlePlay", "instagram", "linkedin"],
   interface: [
     "areaExpand",
     "cutlery",

package/src/index.ts

@@ -144,6 +144,7 @@ export {
   getIconsByGroup,
   ArrowLeftIcon,
   ArrowRightIcon,
+  BackspaceIcon,
   BagIcon,
   BanIcon,
   BellIcon,
@@ -188,6 +189,8 @@ export {
   PawIcon,
   TrashIcon,
   FacebookIcon,
+  FingerprintIcon,
+  GoogleBrandIcon,
   FiltersIcon,
   FullscreenIcon,
   HeartIcon,

package/src/theme/typography.ts

@@ -2,20 +2,20 @@ export const fonts = {
   sans: "Noto Sans Armenian",
 } as const;
 
-/** Button label — SemiBold, line-height 100%, letter-spacing 3%. */
+/** Button label — SemiBold, 125%+ line-height so Noto Sans Armenian is not clipped. */
 export const buttonTypography = {
   lg: {
     fontFamily: fonts.sans,
     fontSize: 14,
     fontWeight: "600" as const,
-    lineHeight: 14,
+    lineHeight: 20,
     letterSpacing: 0.42,
   },
   sm: {
     fontFamily: fonts.sans,
     fontSize: 12,
     fontWeight: "600" as const,
-    lineHeight: 12,
+    lineHeight: 16,
     letterSpacing: 0.36,
   },
 } as const;
@@ -222,7 +222,7 @@ export const datePickerTypography = {
     fontFamily: fonts.sans,
     fontSize: 14,
     fontWeight: "700" as const,
-    lineHeight: 14,
+    lineHeight: 18,
     letterSpacing: 0,
   },
   /** Weekday header (ԵՐ, ԵՔ, ...) — Regular, uppercase, centered, Grey/300. */
@@ -230,14 +230,14 @@ export const datePickerTypography = {
     fontFamily: fonts.sans,
     fontSize: 12,
     fontWeight: "400" as const,
-    lineHeight: 12,
+    lineHeight: 16,
     letterSpacing: 0,
   },
   day: {
     fontFamily: fonts.sans,
     fontSize: 14,
     fontWeight: "400" as const,
-    lineHeight: 14,
+    lineHeight: 18,
     letterSpacing: 0,
   },
 } as const;

package/src/utils/dateUtils.ts

@@ -83,9 +83,10 @@ export function formatDateDayShortMonth(date: Date, monthNames: string[], letter
 }
 
 /**
- * Builds a 6×7 grid of calendar days for the month containing `monthDate`,
- * including the leading/trailing days from adjacent months needed to fill
- * whole weeks. `weekStartsOn` follows the JS `Date#getDay()` convention
+ * Builds a 4–6 × 7 grid of calendar days for the month containing `monthDate`,
+ * including adjacent-month days only when they share a week with this month.
+ * Trailing weeks that are entirely the next month are omitted.
+ * `weekStartsOn` follows the JS `Date#getDay()` convention
  * (0 = Sunday, 1 = Monday, ...).
  */
 export function getMonthMatrix(monthDate: Date, weekStartsOn: 0 | 1 = 1): Date[][] {
@@ -105,7 +106,9 @@ export function getMonthMatrix(monthDate: Date, weekStartsOn: 0 | 1 = 1): Date[]
       days.push(cursor);
       cursor = new Date(cursor.getFullYear(), cursor.getMonth(), cursor.getDate() + 1);
     }
-    weeks.push(days);
+    if (days.some((day) => day.getMonth() === month)) {
+      weeks.push(days);
+    }
   }
   return weeks;
 }