Update Collective profile prototype

opencollective · Oct 7, 2024 · 62a6f0d · 62a6f0d
1 parent a3201a3
commit 62a6f0d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/components/crowdfunding-redesign/FundraiserLayout.tsx b/components/crowdfunding-redesign/FundraiserLayout.tsx
@@ -23,7 +23,7 @@ import { ProfileModal } from './ProfileModal';
 import { ArrowRight } from 'lucide-react';
 import { Progress } from '../ui/Progress';
 import FormattedMoneyAmount from '../FormattedMoneyAmount';
-import { StackedAvatars } from '../Avatar';
+
 import { Button } from '../ui/Button';
 import { FormattedMessage } from 'react-intl';
 import { TabsList, TabsTrigger } from './DumbTabs';

diff --git a/components/crowdfunding-redesign/FundraisingPage.tsx b/components/crowdfunding-redesign/FundraisingPage.tsx
@@ -58,22 +58,22 @@ export function FundraisingPage() {
             allowAttributes
             transform={node => {
               // Allow some iframes
-              const attrs = [].slice.call(node.attributes);
-              if (node.tagName === 'iframe') {
+              if (node.tagName.toLowerCase() === 'iframe') {
                 const src = node.getAttribute('src');
                 const parsedUrl = new URL(src);
                 const hostname = parsedUrl.hostname;
                 if (['youtube-nocookie.com', 'www.youtube-nocookie.com', 'anchor.fm'].includes(hostname)) {
-                  const attributes = merge({}, ...attrs.map(({ name, value }) => ({ [name]: value })));
                   return (
                     <iframe
-                      {...pick(attributes, ['width', 'height', 'frameborder', 'allowfullscreen'])}
-                      title={attributes.title || 'Embed content'}
+                      width={node.getAttribute('width')}
+                      height={node.getAttribute('height')}
+                      allowFullScreen={node.getAttribute('allowfullscreen') as any}
+                      title={node.getAttribute('title') || 'Embed content'}
                       src={src}
                     />
                   );
                 }
-              } else if (node.tagName === 'a') {
+              } else if (node.tagName.toLowerCase() === 'a') {
                 // Open links in new tab
                 node.setAttribute('target', '_blank');
                 node.setAttribute('rel', 'noopener noreferrer');

diff --git a/components/crowdfunding-redesign/Goal.tsx b/components/crowdfunding-redesign/Goal.tsx
@@ -4,7 +4,6 @@ import { aggregateGoalAmounts } from './helpers';
 
 import { Progress } from '../ui/Progress';
 import FormattedMoneyAmount from '../FormattedMoneyAmount';
-import { StackedAvatars } from '../Avatar';
 
 // Naive implementation of Goals for prototype
 export function Goal({ account }) {

diff --git a/components/crowdfunding-redesign/Goals.tsx b/components/crowdfunding-redesign/Goals.tsx
@@ -4,8 +4,7 @@ import { aggregateGoalAmounts } from './helpers';
 
 import { Progress } from '../ui/Progress';
 import FormattedMoneyAmount from '../FormattedMoneyAmount';
-import { StackedAvatars } from '../Avatar';
-
+import StackedAvatars from '../StackedAvatars';
 // Naive implementation of Goals for prototype
 export function Goals({ account }) {
   if (!account) {

diff --git a/pages/preview/[collectiveSlug]/index.tsx b/pages/preview/[collectiveSlug]/index.tsx
@@ -118,22 +118,22 @@ export default function ContributePage() {
                   allowAttributes
                   transform={node => {
                     // Allow some iframes
-                    const attrs = [].slice.call(node.attributes);
-                    if (node.tagName === 'iframe') {
+                    if (node.tagName.toLowerCase() === 'iframe') {
                       const src = node.getAttribute('src');
                       const parsedUrl = new URL(src);
                       const hostname = parsedUrl.hostname;
                       if (['youtube-nocookie.com', 'www.youtube-nocookie.com', 'anchor.fm'].includes(hostname)) {
-                        const attributes = merge({}, ...attrs.map(({ name, value }) => ({ [name]: value })));
                         return (
                           <iframe
-                            {...pick(attributes, ['width', 'height', 'frameborder', 'allowfullscreen'])}
-                            title={attributes.title || 'Embed content'}
+                            width={node.getAttribute('width')}
+                            height={node.getAttribute('height')}
+                            allowFullScreen={node.getAttribute('allowfullscreen') as any}
+                            title={node.getAttribute('title') || 'Embed content'}
                             src={src}
                           />
                         );
                       }
-                    } else if (node.tagName === 'a') {
+                    } else if (node.tagName.toLowerCase() === 'a') {
                       // Open links in new tab
                       node.setAttribute('target', '_blank');
                       node.setAttribute('rel', 'noopener noreferrer');