From 6fd64b22099a5860945e55a13e6e7da7973d0aad Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Tue, 18 Apr 2023 18:23:46 +0530 Subject: [PATCH] Fix: cssVars API not working correctly on Booker Timeslot selection page (#8296) * Use a method out of react scope to set CSS vars as that doesnt need react * Refactor --- apps/web/pages/_app.tsx | 17 ------ apps/web/pages/_document.tsx | 2 - apps/web/public/embed-init-iframe.js | 26 --------- .../embeds/embed-core/embed-iframe-init.ts | 55 +++++++++++++++++++ packages/embeds/embed-core/index.html | 20 +++---- .../embeds/embed-core/src/embed-iframe.ts | 12 +++- packages/embeds/embed-react/inline.tsx | 13 +++++ 7 files changed, 89 insertions(+), 56 deletions(-) delete mode 100644 apps/web/public/embed-init-iframe.js create mode 100644 packages/embeds/embed-core/embed-iframe-init.ts diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx index 231c005abe..9caa8a48b6 100644 --- a/apps/web/pages/_app.tsx +++ b/apps/web/pages/_app.tsx @@ -5,7 +5,6 @@ import Head from "next/head"; import Script from "next/script"; import "@calcom/embed-core/src/embed-iframe"; -import { useEmbedUiConfig } from "@calcom/embed-core/src/embed-iframe"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import { trpc } from "@calcom/trpc/react"; @@ -28,17 +27,6 @@ const calFont = localFont({ function MyApp(props: AppProps) { const { Component, pageProps, err, router } = props; let pageStatus = "200"; - const { cssVarsPerTheme } = useEmbedUiConfig(); - const cssVarsStyle = []; - if (cssVarsPerTheme) { - for (const [themeName, cssVars] of Object.entries(cssVarsPerTheme)) { - cssVarsStyle.push(`.${themeName} {`); - for (const [cssVarName, value] of Object.entries(cssVars)) { - cssVarsStyle.push(`--${cssVarName}: ${value};`); - } - cssVarsStyle.push(`}`); - } - } if (router.pathname === "/404") { pageStatus = "404"; @@ -76,11 +64,6 @@ function MyApp(props: AppProps) { } `} - diff --git a/apps/web/pages/_document.tsx b/apps/web/pages/_document.tsx index 715ec084a0..aae5340cb4 100644 --- a/apps/web/pages/_document.tsx +++ b/apps/web/pages/_document.tsx @@ -1,6 +1,5 @@ import type { DocumentContext, DocumentProps } from "next/document"; import Document, { Head, Html, Main, NextScript } from "next/document"; -import Script from "next/script"; import { z } from "zod"; import { getDirFromLang } from "@calcom/lib/i18n"; @@ -42,7 +41,6 @@ class MyDocument extends Document { -