-
-
+
+ {blog.title}
- {typeof blog.body === 'string' && ( -{parse(blog.body.slice(0, 80))}
- )}
-
+
))}
diff --git a/components/blog-list.tsx b/components/blog-list.tsx
index 6fa3419c..c76cabf7 100644
--- a/components/blog-list.tsx
+++ b/components/blog-list.tsx
@@ -37,23 +37,19 @@ function BlogList({ bloglist }: { bloglist: BloglistProps }) {
return (
{blog.title}
+ {typeof blog.body === 'string' && ( +{parse(blog.body.slice(0, 80))}
+ )}
+
{bloglist.featured_image && (
-
-
- 
-
+
+
)}
diff --git a/components/card-section.tsx b/components/card-section.tsx
index 027c5842..b57a7e34 100644
--- a/components/card-section.tsx
+++ b/components/card-section.tsx
@@ -27,8 +27,8 @@ export default function CardSection({ cards }: CardProps) {
{card.description &&
{bloglist.title && (
-
-
-
@@ -75,8 +74,8 @@ export default function BlogSection(props: FeaturedBlogProps) {
{bloglist.title}
- + +{bloglist.title}
)}@@ -67,10 +63,8 @@ function BlogList({ bloglist }: { bloglist: BloglistProps }) {
{parse(body)}
{bloglist.url ? (
-
-
- {'Read more -->'}
-
+
+ {'Read more -->'}
) : (
''
diff --git a/components/blog-section.tsx b/components/blog-section.tsx
index fa886a32..d977dcb8 100644
--- a/components/blog-section.tsx
+++ b/components/blog-section.tsx
@@ -48,13 +48,12 @@ export default function BlogSection(props: FeaturedBlogProps) {
{fromBlog.title_h2}
)} {fromBlog.view_articles && ( - - - {fromBlog.view_articles.title} - + + {fromBlog.view_articles.title} )}{parse(blog.body.slice(0, 300))}
)}
{blog.url && (
-
- {'Read More -->'}
+
+ {'Read More -->'}
)}
{card.description}
}
{card.call_to_action.title && card.call_to_action.href && (
-
- {card.call_to_action.title}
+
+ {card.call_to_action.title}
)}
diff --git a/components/footer.tsx b/components/footer.tsx
index e92a3823..5565d625 100644
--- a/components/footer.tsx
+++ b/components/footer.tsx
@@ -68,16 +68,14 @@ export default function Footer() {
{footerData && footerData.logo ? (
-
-
- 
-
+
+
) : (
{headerData ? (
-
-
- 
-
+
+
) : (
;
+ const timeoutRef = useRef | null>(null);
+ const toolTipRef = useRef(null);
- const showTip = () => {
- timeout = setTimeout(() => {
- toolTipRef.current.style.display = "block";
+ const showTip = useCallback(() => {
+ timeoutRef.current = setTimeout(() => {
+ if (toolTipRef.current) {
+ toolTipRef.current.style.display = "block";
+ }
}, props.delay || 400);
- };
+ }, [props.delay]);
- const hideTip = () => {
- clearInterval(timeout);
- toolTipRef.current.style.display = "none";
- };
+ const hideTip = useCallback(() => {
+ if (timeoutRef.current) {
+ clearTimeout(timeoutRef.current);
+ }
+ if (toolTipRef.current) {
+ toolTipRef.current.style.display = "none";
+ }
+ }, []);
useEffect(() => {
if (props.dynamic) {
- props.status !== 0 && (toolTipRef.current.style.display = "block");
- timeout = setTimeout(() => {
- toolTipRef.current.style.display = "none";
+ if (props.status !== 0 && toolTipRef.current) {
+ toolTipRef.current.style.display = "block";
+ }
+ timeoutRef.current = setTimeout(() => {
+ if (toolTipRef.current) {
+ toolTipRef.current.style.display = "none";
+ }
}, props.delay || 400);
}
- }, [props.content]);
+
+ return () => {
+ if (timeoutRef.current) {
+ clearTimeout(timeoutRef.current);
+ }
+ };
+ }, [props.content, props.dynamic, props.status, props.delay]);
return (
{section.description}
)} {section.call_to_action.title && section.call_to_action.href ? ( - - - {section.call_to_action.title} - + + {section.call_to_action.title} ) : ( '' diff --git a/components/tool-tip.tsx b/components/tool-tip.tsx index 75d11fea..c06916fd 100644 --- a/components/tool-tip.tsx +++ b/components/tool-tip.tsx @@ -1,7 +1,7 @@ -import React, { useRef, useEffect, MutableRefObject } from 'react'; +import React, { useRef, useEffect, useCallback } from 'react'; type TooltipProps = { - children?: JSX.Element|JSX.Element[]; + children?: React.ReactNode; content: string; direction: string; status: number; @@ -10,28 +10,44 @@ type TooltipProps = { } const Tooltip = (props: TooltipProps) => { - let timeout: any; - const toolTipRef = useRef() as MutableRefObject next(node.children),
@@ -56,7 +62,6 @@ export default {
const query = Stack.ContentType(contentTypeUid).Query();
if (referenceFieldPath) query.includeReference(referenceFieldPath);
query
- .includeOwner()
.toJSON()
.find()
.then(
@@ -91,9 +96,9 @@ export default {
return new Promise((resolve, reject) => {
const blogQuery = Stack.ContentType(contentTypeUid).Query();
if (referenceFieldPath) blogQuery.includeReference(referenceFieldPath);
- blogQuery.includeOwner().toJSON();
- const data = blogQuery.where('url', `${entryUrl}`).find();
- data.then(
+ blogQuery.toJSON();
+ const data = blogQuery.where('url', `${entryUrl}`)?.find();
+ data?.then(
(result) => {
jsonRtePath
&& Utils.jsonToHTML({
@@ -107,7 +112,10 @@ export default {
console.error(error);
reject(error);
},
- );
+ ).catch((err) => {
+ console.error(err);
+ reject(err);
+ });
});
},
};
diff --git a/next-env.d.ts b/next-env.d.ts
index 4f11a03d..830fb594 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,5 +1,6 @@
///