Merge remote-tracking branch 'origin/main' into jonas-jonas/fixSettin…

…gsFlow

.github/workflows/licenses.yml

@@ -1,3 +1,6 @@
+# AUTO-GENERATED, DO NOT EDIT!
+# Please edit the original at https://github.com/ory/meta/blob/master/templates/repository/common/.github/workflows/licenses.yml
+
 name: Licenses
 
 on:
@@ -11,11 +14,14 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: "1.18"
-      - uses: actions/setup-node@v2
+      - name: Install script
+        uses: ory/ci/licenses/setup@master
         with:
-          node-version: "18"
-      - run: make licenses
+          token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }}
+      - name: Check licenses
+        uses: ory/ci/licenses/check@master
+      - name: Write licenses
+        uses: ory/ci/licenses/write@master
+        if:
+          ${{ github.ref == 'refs/heads/main' || github.ref ==
+          'refs/heads/master' }}

packages/elements-react/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 1.0.0-next.18 (2024-12-30)
+
+### 🚀 Features
+
+- add page and app router examples ([#307](https://github.com/ory/elements/pull/307))
+- ⚠️  add getServerSession and SessionProvider ([#309](https://github.com/ory/elements/pull/309))
+- add @ory/nextjs package ([#303](https://github.com/ory/elements/pull/303))
+
+### 🩹 Fixes
+
+- align font sizes to design & use updated variable names ([#318](https://github.com/ory/elements/pull/318))
+- properly set default value for checkboxes ([#314](https://github.com/ory/elements/pull/314))
+- passkey and webauthn in settings flow ([#317](https://github.com/ory/elements/pull/317))
+
+### ⚠️  Breaking Changes
+
+- ⚠️  add getServerSession and SessionProvider ([#309](https://github.com/ory/elements/pull/309))
+
+### ❤️  Thank You
+
+- hackerman @aeneasr
+- Jonas Hungershausen
+
 ## 1.0.0-next.17 (2024-11-27)
 
 

packages/elements-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ory/elements-react",
-  "version": "1.0.0-next.17",
+  "version": "1.0.0-next.18",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",

packages/elements-react/src/theme/default/components/card/badge.tsx

@@ -6,7 +6,7 @@ import OryLogoVertical from "../../assets/ory-badge-vertical.svg"
 
 export function Badge() {
   return (
-    <div className="absolute bg-ory-background-default p-2 font-bold max-sm:bottom-0 max-sm:left-8 max-sm:translate-y-full max-sm:rounded-b-md sm:right-0 sm:top-8 sm:translate-x-full sm:rounded-r-lg border-button-social-border-default border max-sm:py-[7px] sm:pl-[7px]">
+    <div className="absolute bg-ory-background-default p-2 font-bold max-sm:bottom-0 max-sm:left-8 max-sm:translate-y-full max-sm:rounded-b-md sm:right-0 sm:top-8 sm:translate-x-full sm:rounded-r-lg border-ory-border-default border max-sm:py-[7px] sm:pl-[7px]">
       <OryLogoHorizontal width={22} height={8} className="sm:hidden" />
       <OryLogoVertical width={8} height={22} className="max-sm:hidden" />
     </div>

packages/elements-react/src/theme/default/components/card/current-identifier-button.tsx

@@ -35,7 +35,7 @@ export function DefaultCurrentIdentifierButton() {
   return (
     <a
       className={
-        "inline-flex max-w-full cursor-pointer items-center gap-1 self-start rounded-full border px-[11px] py-[5px] transition-colors " +
+        "group inline-flex max-w-full cursor-pointer items-center gap-1 self-start rounded-full border px-[11px] py-[5px] transition-colors " +
         "border-button-identifier-border-border-default bg-button-identifier-background-default hover:border-button-identifier-border-border-hover hover:bg-button-identifier-background-hover"
       }
       {...attributes}
@@ -46,9 +46,9 @@ export function DefaultCurrentIdentifierButton() {
         <IconArrowLeft
           size={16}
           stroke="1"
-          className="shrink-0 text-button-identifier-foreground-default "
+          className="shrink-0 text-button-identifier-foreground-default group-hover:text-button-identifier-foreground-hover"
         />
-        <span className="overflow-hidden text-ellipsis text-nowrap text-sm font-medium text-button-identifier-foreground-default">
+        <span className="overflow-hidden text-ellipsis text-nowrap text-sm font-medium text-button-identifier-foreground-default group-hover:text-button-identifier-foreground-hover">
           {nodeBackButton?.attributes.value}
         </span>
       </span>

packages/elements-react/src/theme/default/components/form/input.tsx

@@ -53,6 +53,7 @@ export const DefaultInput = ({
         "bg-input-background-default border-input-border-default text-input-foreground-primary",
         "disabled:bg-input-background-disabled disabled:border-input-border-disabled disabled:text-input-foreground-disabled",
         "focus:border-input-border-focus focus-visible:border-input-border-focus",
+        "hover:bg-input-background-hover hover:border-input-border-hover",
         "px-4 py-[13px]",
         // The settings flow input fields are supposed to be dense, so we don't need the extra padding we want on the user flows.
         flowType === FlowType.Settings && "max-w-[488px]",

packages/elements-react/src/theme/default/components/form/social.tsx

@@ -67,7 +67,7 @@ export function DefaultButtonSocial({
 
   return (
     <button
-      className="gap-3 border border-button-social-border-default bg-button-social-background-default hover:bg-button-social-background-hover transition-colors rounded flex items-center justify-center px-4 py-[13px]"
+      className="gap-3 border border-button-social-border-default bg-button-social-background-default hover:bg-button-social-background-hover transition-colors rounded flex items-center justify-center px-4 py-[13px] disabled:bg-button-social-background-disabled disabled:border-button-social-border-disabled disabled:text-button-social-foreground-disabled hover:text-button-social-foreground-disabled"
       value={attributes.value}
       type="submit"
       name="provider"