Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid key update for every re-render of ArticleContent with the same content #423

Closed
wants to merge 1 commit into from
Closed

Avoid key update for every re-render of ArticleContent with the same content #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/newssite/news-next/dist/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_buildManifest.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"hVjtt3DRTxwTZ0w7LdK0j","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/eYvb0VVEPgCCVf6fOsaPy/_buildManifest.js" defer=""></script><script src="./_next/static/eYvb0VVEPgCCVf6fOsaPy/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"eYvb0VVEPgCCVf6fOsaPy","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
2 changes: 1 addition & 1 deletion ...ic/chunks/pages/index-a6d76b1b73bbfbe0.js → ...ic/chunks/pages/index-08da8d5e453ca811.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...c/hVjtt3DRTxwTZ0w7LdK0j/_buildManifest.js → ...c/eYvb0VVEPgCCVf6fOsaPy/_buildManifest.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...tic/hVjtt3DRTxwTZ0w7LdK0j/_ssgManifest.js → ...tic/eYvb0VVEPgCCVf6fOsaPy/_ssgManifest.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/newssite/news-next/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-a6d76b1b73bbfbe0.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_buildManifest.js" defer=""></script><script src="./_next/static/hVjtt3DRTxwTZ0w7LdK0j/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"hVjtt3DRTxwTZ0w7LdK0j","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-08da8d5e453ca811.js" defer=""></script><script src="./_next/static/eYvb0VVEPgCCVf6fOsaPy/_buildManifest.js" defer=""></script><script src="./_next/static/eYvb0VVEPgCCVf6fOsaPy/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"eYvb0VVEPgCCVf6fOsaPy","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
30 changes: 20 additions & 10 deletions resources/newssite/news-next/src/components/article/article-content.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useMemo } from "react";
import { v4 as uuidv4 } from "uuid";
import classNames from "classnames";

Expand All @@ -8,6 +9,15 @@ import styles from "news-site-css/dist/article.module.css";
import layoutStyles from "news-site-css/dist/layout.module.css";

export default function ArticleContent({ type, content, display }) {
function createContentWithId(type, content) {
return type !== "text" ? content.map((item) => ({ ...item, id: uuidv4() })) : content;
}

const contentWithId = useMemo(
() => createContentWithId(type, content),
[type, content]
);

if (type === "text") {
return (
<div className={styles["article-content"]}>
Expand All @@ -20,8 +30,8 @@ export default function ArticleContent({ type, content, display }) {
return (
<div className={styles["article-content"]}>
<ul className={classNames(styles["article-list"], styles.vertical, { [styles[display]]: display })}>
{content.map((item) =>
<li key={uuidv4()} className={styles["article-list-item"]}>
{contentWithId.map((item) =>
<li key={item.id} className={styles["article-list-item"]}>
{item.url && !item.title
? <a href={item.url}>
<ArticleText text={item.content} />
Expand All @@ -39,8 +49,8 @@ export default function ArticleContent({ type, content, display }) {
return (
<div className={styles["article-list-content"]}>
<ul className={classNames(styles["article-list"], styles.vertical)}>
{content.map((item) =>
<li key={uuidv4()} className={styles["article-list-item"]}>
{contentWithId.map((item) =>
<li key={item.id} className={styles["article-list-item"]}>
<ArticleText textClass={classNames(styles["article-title"], "truncate-multiline", "truncate-multiline-3")} text={item.title} type="h3" />
{item.url && !item.title
? <a href={item.url}>
Expand All @@ -58,8 +68,8 @@ export default function ArticleContent({ type, content, display }) {
if (type === "excerpt") {
return (
<ul className={classNames(styles["article-list"], styles.horizontal)}>
{content.map((item) =>
<li key={uuidv4()} className={styles["article-list-item"]}>
{contentWithId.map((item) =>
<li key={item.id} className={styles["article-list-item"]}>
<ArticleImage imageClass={styles["article-hero"]} image={item.image} />
<div className={styles["article-content"]}>
<ArticleText textClass="truncate-multiline truncate-multiline-3" text={item.text} type="div" />
Expand All @@ -73,8 +83,8 @@ export default function ArticleContent({ type, content, display }) {
if (type === "grid") {
return (
<div className={classNames(layoutStyles["grid-container"], { [layoutStyles[display]]: display })}>
{content.map((item) =>
<div key={uuidv4()} className={layoutStyles["grid-item"]}>
{contentWithId.map((item) =>
<div key={item.id} className={layoutStyles["grid-item"]}>
<ArticleImage imageClass={styles["article-image-container"]} image={item.image} meta={item.meta} />

{item.url
Expand All @@ -92,8 +102,8 @@ export default function ArticleContent({ type, content, display }) {
if (type === "preview") {
return (
<ul className={classNames(styles["article-list"], styles.vertical)}>
{content.map((item) =>
<li key={uuidv4()} className={styles["article-list-item"]}>
{contentWithId.map((item) =>
<li key={item.id} className={styles["article-list-item"]}>
<ArticleImage imageClass={styles["article-image-container"]} image={item.image} />
<ArticleText textClass={classNames(styles["article-title"], "truncate-multiline", "truncate-multiline-3")} text={item.title} type="h3" />
</li>
Expand Down
Loading