From 7f9c54f48274d14e6a028d23d251186c98717b64 Mon Sep 17 00:00:00 2001
From: Mikhaela Tapia <mikhaelatapia@gmail.com>
Date: Thu, 20 Nov 2025 15:14:25 +0800
Subject: [PATCH 1/2] fix video upload date error

---
 src/block/video-popup/edit.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/block/video-popup/edit.js b/src/block/video-popup/edit.js
index b345915a8b..3ec2021510 100644
--- a/src/block/video-popup/edit.js
+++ b/src/block/video-popup/edit.js
@@ -183,12 +183,23 @@ const InspectorControls = memo( props => {
 							videoUploadDate: '',
 						} ) }
 						onChange={ media => {
+							let videoUploadDate = ''
+
+							try {
+								videoUploadDate = media.date?.toISOString()
+							} catch ( error ) {
+								try {
+									videoUploadDate = new Date( media.date ).toISOString()
+								} catch ( error ) {
+									videoUploadDate = ''
+								}
+							}
 							props.setAttributes( {
 								videoLink: media.url,
 								videoId: media.url,
 								videoName: media.title, // Use title, description and date from media library for video schema
-								videoDescription: media.description,
-								videoUploadDate: media.date.toISOString(),
+								videoDescription: media.description || '',
+								videoUploadDate,
 							} )
 						} }
 						imageId={ urlIsVideo( props.videoLink ) ? props.videoId : '' }

From 4c0f29aeb1f13cc4792edbea2e5217c06c1453d0 Mon Sep 17 00:00:00 2001
From: Mikhaela Tapia <mikhaelatapia@gmail.com>
Date: Thu, 20 Nov 2025 15:22:45 +0800
Subject: [PATCH 2/2] fix implementation

---
 src/block/video-popup/edit.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/block/video-popup/edit.js b/src/block/video-popup/edit.js
index 3ec2021510..6b9aed0db7 100644
--- a/src/block/video-popup/edit.js
+++ b/src/block/video-popup/edit.js
@@ -183,23 +183,24 @@ const InspectorControls = memo( props => {
 							videoUploadDate: '',
 						} ) }
 						onChange={ media => {
-							let videoUploadDate = ''
+							let videoUploadDate = null
 
-							try {
-								videoUploadDate = media.date?.toISOString()
-							} catch ( error ) {
+							if ( media.date ) {
 								try {
-									videoUploadDate = new Date( media.date ).toISOString()
+									videoUploadDate = media.date instanceof Date
+										? media.date.toISOString()
+										: new Date( media.date ).toISOString()
 								} catch ( error ) {
-									videoUploadDate = ''
+									videoUploadDate = null
 								}
 							}
+
 							props.setAttributes( {
 								videoLink: media.url,
 								videoId: media.url,
 								videoName: media.title, // Use title, description and date from media library for video schema
 								videoDescription: media.description || '',
-								videoUploadDate,
+								videoUploadDate: videoUploadDate ?? undefined,
 							} )
 						} }
 						imageId={ urlIsVideo( props.videoLink ) ? props.videoId : '' }