From b0d406d6ff013e74e6457f2e9a24e5f956322b3d Mon Sep 17 00:00:00 2001
From: Isaac Roberts <119639439+madebyisaacr@users.noreply.github.com>
Date: Thu, 19 Feb 2026 14:11:29 -0500
Subject: [PATCH 1/5] Last modified time note

---
 plugins/airtable/src/App.css          | 11 +++++++++++
 plugins/airtable/src/FieldMapping.tsx | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/plugins/airtable/src/App.css b/plugins/airtable/src/App.css
index 1118b6430..f260997c4 100644
--- a/plugins/airtable/src/App.css
+++ b/plugins/airtable/src/App.css
@@ -225,3 +225,14 @@ select:not(:disabled) {
     flex: 1;
     width: 100%;
 }
+
+.note {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: left;
+    gap: 14px;
+    width: 100%;
+    padding-left: 4px;
+    color: var(--framer-color-text-tertiary);
+}
diff --git a/plugins/airtable/src/FieldMapping.tsx b/plugins/airtable/src/FieldMapping.tsx
index c102102c9..785f28313 100644
--- a/plugins/airtable/src/FieldMapping.tsx
+++ b/plugins/airtable/src/FieldMapping.tsx
@@ -165,6 +165,8 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId }: Fie
     const [fields, setFields] = useState(initialManagedCollectionFields)
     const [ignoredFieldIds, setIgnoredFieldIds] = useState(initialFieldIds)
 
+    const lastModifiedTimeFieldId = dataSource.fields.find(field => field.airtableType === "lastModifiedTime")?.id
+
     // Create a map of field IDs to names for efficient lookup
     const originalFieldNameMap = useMemo(
         () => new Map(dataSource.fields.map(field => [field.id, field.name])),
@@ -347,6 +349,21 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId }: Fie
         <form className="framer-hide-scrollbar mapping" onSubmit={handleSubmit}>
             <hr className="sticky-top" />
 
+            {!lastModifiedTimeFieldId && (
+                <>
+                    <div className="note">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
+                            <path
+                                d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm0 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM5 9a1 1 0 0 0 2 0V6a1 1 0 0 0-2 0Z"
+                                fill="currentColor"
+                            ></path>
+                        </svg>
+                        <p>Add a “Last Modified Time” column in Airtable to sync faster</p>
+                    </div>
+                    <hr />
+                </>
+            )}
+
             <label className="slug-field" htmlFor="slugField">
                 <span>Slug Field</span>
                 <select

From d8d6ddcb9a112c85bc0e04b8ba7c7c07461d0ce0 Mon Sep 17 00:00:00 2001
From: Isaac Roberts <119639439+madebyisaacr@users.noreply.github.com>
Date: Thu, 19 Feb 2026 14:20:25 -0500
Subject: [PATCH 2/5] Save and load last synced time

---
 plugins/airtable/src/App.tsx          | 18 ++++++++++++++++--
 plugins/airtable/src/FieldMapping.tsx | 18 ++++++++++++++----
 plugins/airtable/src/data.ts          | 22 ++++++++++++++++++----
 plugins/airtable/src/main.tsx         | 19 ++++++++++++-------
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/plugins/airtable/src/App.tsx b/plugins/airtable/src/App.tsx
index 7cf79d8b4..433cec47d 100644
--- a/plugins/airtable/src/App.tsx
+++ b/plugins/airtable/src/App.tsx
@@ -17,9 +17,16 @@ interface AppProps {
     previousBaseId: string | null
     previousTableId: string | null
     previousSlugFieldId: string | null
+    previousLastSynced: string | null
 }
 
-export function App({ collection, previousBaseId, previousTableId, previousSlugFieldId }: AppProps) {
+export function App({
+    collection,
+    previousBaseId,
+    previousTableId,
+    previousSlugFieldId,
+    previousLastSynced,
+}: AppProps) {
     const [dataSource, setDataSource] = useState<DataSource | null>(null)
     const [isLoadingDataSource, setIsLoadingDataSource] = useState(Boolean(previousBaseId && previousTableId))
     const [noTableAccess, setNoTableAccess] = useState(false)
@@ -97,5 +104,12 @@ export function App({ collection, previousBaseId, previousTableId, previousSlugF
         return <SelectDataSource collection={collection} onSelectDataSource={setDataSource} />
     }
 
-    return <FieldMapping collection={collection} dataSource={dataSource} initialSlugFieldId={previousSlugFieldId} />
+    return (
+        <FieldMapping
+            collection={collection}
+            dataSource={dataSource}
+            initialSlugFieldId={previousSlugFieldId}
+            previousLastSynced={previousLastSynced}
+        />
+    )
 }
diff --git a/plugins/airtable/src/FieldMapping.tsx b/plugins/airtable/src/FieldMapping.tsx
index 785f28313..e1eba1ae3 100644
--- a/plugins/airtable/src/FieldMapping.tsx
+++ b/plugins/airtable/src/FieldMapping.tsx
@@ -147,9 +147,10 @@ interface FieldMappingProps {
     collection: ManagedCollection
     dataSource: DataSource
     initialSlugFieldId: string | null
+    previousLastSynced: string | null
 }
 
-export function FieldMapping({ collection, dataSource, initialSlugFieldId }: FieldMappingProps) {
+export function FieldMapping({ collection, dataSource, initialSlugFieldId, previousLastSynced }: FieldMappingProps) {
     const [status, setStatus] = useState<"mapping-fields" | "loading-fields" | "syncing-collection">(
         initialSlugFieldId ? "loading-fields" : "mapping-fields"
     )
@@ -165,7 +166,7 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId }: Fie
     const [fields, setFields] = useState(initialManagedCollectionFields)
     const [ignoredFieldIds, setIgnoredFieldIds] = useState(initialFieldIds)
 
-    const lastModifiedTimeFieldId = dataSource.fields.find(field => field.airtableType === "lastModifiedTime")?.id
+    const hasLastModifiedTimeField = dataSource.fields.some(field => field.airtableType === "lastModifiedTime")
 
     // Create a map of field IDs to names for efficient lookup
     const originalFieldNameMap = useMemo(
@@ -312,8 +313,17 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId }: Fie
                             field.collectionId !== ""
                     )
 
+                const syncStartedAtDate = new Date().toISOString()
+
                 await collection.setFields(processFields(fieldsToSync))
-                await syncCollection(collection, dataSource, fieldsToSync, selectedSlugField.id)
+                await syncCollection(
+                    collection,
+                    dataSource,
+                    fieldsToSync,
+                    selectedSlugField.id,
+                    previousLastSynced,
+                    syncStartedAtDate
+                )
                 framer.closePlugin("Synchronization successful", {
                     variant: "success",
                 })
@@ -349,7 +359,7 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId }: Fie
         <form className="framer-hide-scrollbar mapping" onSubmit={handleSubmit}>
             <hr className="sticky-top" />
 
-            {!lastModifiedTimeFieldId && (
+            {!hasLastModifiedTimeField && (
                 <>
                     <div className="note">
                         <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
diff --git a/plugins/airtable/src/data.ts b/plugins/airtable/src/data.ts
index fdef16612..11ac73448 100644
--- a/plugins/airtable/src/data.ts
+++ b/plugins/airtable/src/data.ts
@@ -28,6 +28,7 @@ export const PLUGIN_KEYS = {
     TABLE_ID: "airtablePluginTableId",
     TABLE_NAME: "airtablePluginTableName",
     SLUG_FIELD_ID: "airtablePluginSlugId",
+    LAST_SYNCED: "airtablePluginLastSynced",
 } as const
 
 const IMAGE_FILE_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/apng", "image/webp", "image/svg+xml"]
@@ -469,7 +470,9 @@ export async function syncCollection(
     collection: ManagedCollection,
     dataSource: DataSource,
     fields: readonly PossibleField[],
-    slugFieldId: string
+    slugFieldId: string,
+    previousLastSynced: string | null,
+    syncStartedAtDate: string
 ) {
     const dataSourceItems = await getItems({ ...dataSource, fields }, slugFieldId)
     const items: ManagedCollectionItemInput[] = []
@@ -512,6 +515,7 @@ export async function syncCollection(
         collection.setPluginData(PLUGIN_KEYS.TABLE_ID, dataSource.tableId),
         collection.setPluginData(PLUGIN_KEYS.TABLE_NAME, dataSource.tableName),
         collection.setPluginData(PLUGIN_KEYS.SLUG_FIELD_ID, slugFieldId),
+        collection.setPluginData(PLUGIN_KEYS.LAST_SYNCED, syncStartedAtDate),
     ])
 }
 
@@ -526,7 +530,8 @@ export async function syncExistingCollection(
     previousBaseId: string | null,
     previousTableId: string | null,
     previousTableName: string | null,
-    previousSlugFieldId: string | null
+    previousSlugFieldId: string | null,
+    previousLastSynced: string | null
 ): Promise<{ didSync: boolean }> {
     if (!previousBaseId || !previousTableId) {
         return { didSync: false }
@@ -541,7 +546,9 @@ export async function syncExistingCollection(
     }
 
     try {
-        await framer.hideUI()
+        void framer.hideUI()
+
+        const syncStartedAtDate = new Date().toISOString()
 
         const existingFields = await collection.getFields()
         const table = await fetchTable(previousBaseId, previousTableId)
@@ -574,7 +581,14 @@ export async function syncExistingCollection(
             tableName: table.name,
             fields: mergedFields,
         }
-        await syncCollection(collection, dataSource, fieldsToSync, previousSlugFieldId)
+        await syncCollection(
+            collection,
+            dataSource,
+            fieldsToSync,
+            previousSlugFieldId,
+            previousLastSynced,
+            syncStartedAtDate
+        )
         return { didSync: true }
     } catch (error) {
         console.error(error)
diff --git a/plugins/airtable/src/main.tsx b/plugins/airtable/src/main.tsx
index 79ab02ac3..44cf04a90 100644
--- a/plugins/airtable/src/main.tsx
+++ b/plugins/airtable/src/main.tsx
@@ -33,19 +33,23 @@ if (!tokens) {
     })
 }
 
-const [previousBaseId, previousTableId, previousTableName, previousSlugFieldId] = await Promise.all([
-    activeCollection.getPluginData(PLUGIN_KEYS.BASE_ID),
-    activeCollection.getPluginData(PLUGIN_KEYS.TABLE_ID),
-    activeCollection.getPluginData(PLUGIN_KEYS.TABLE_NAME),
-    activeCollection.getPluginData(PLUGIN_KEYS.SLUG_FIELD_ID),
-])
+const [previousBaseId, previousTableId, previousTableName, previousSlugFieldId, previousLastSynced] = await Promise.all(
+    [
+        activeCollection.getPluginData(PLUGIN_KEYS.BASE_ID),
+        activeCollection.getPluginData(PLUGIN_KEYS.TABLE_ID),
+        activeCollection.getPluginData(PLUGIN_KEYS.TABLE_NAME),
+        activeCollection.getPluginData(PLUGIN_KEYS.SLUG_FIELD_ID),
+        activeCollection.getPluginData(PLUGIN_KEYS.LAST_SYNCED),
+    ]
+)
 
 const { didSync } = await syncExistingCollection(
     activeCollection,
     previousBaseId,
     previousTableId,
     previousTableName,
-    previousSlugFieldId
+    previousSlugFieldId,
+    previousLastSynced
 )
 
 if (didSync) {
@@ -60,6 +64,7 @@ if (didSync) {
                 previousBaseId={previousBaseId}
                 previousTableId={previousTableId}
                 previousSlugFieldId={previousSlugFieldId}
+                previousLastSynced={previousLastSynced}
             />
         </React.StrictMode>
     )

From e680dab941313827678a1c42871a2a50b1126f01 Mon Sep 17 00:00:00 2001
From: Isaac Roberts <119639439+madebyisaacr@users.noreply.github.com>
Date: Thu, 19 Feb 2026 14:54:45 -0500
Subject: [PATCH 3/5] Skip importing unchanged items

---
 plugins/airtable/src/FieldMapping.tsx     |  2 +-
 plugins/airtable/src/SelectDataSource.tsx |  3 ++
 plugins/airtable/src/data.ts              | 54 +++++++++++++++++++----
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/plugins/airtable/src/FieldMapping.tsx b/plugins/airtable/src/FieldMapping.tsx
index e1eba1ae3..3bbfe950e 100644
--- a/plugins/airtable/src/FieldMapping.tsx
+++ b/plugins/airtable/src/FieldMapping.tsx
@@ -368,7 +368,7 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId, previ
                                 fill="currentColor"
                             ></path>
                         </svg>
-                        <p>Add a “Last Modified Time” column in Airtable to sync faster</p>
+                        <p>Add a “Last Modified Time” column in Airtable to sync faster.</p>
                     </div>
                     <hr />
                 </>
diff --git a/plugins/airtable/src/SelectDataSource.tsx b/plugins/airtable/src/SelectDataSource.tsx
index f19c9fc10..9d053db97 100644
--- a/plugins/airtable/src/SelectDataSource.tsx
+++ b/plugins/airtable/src/SelectDataSource.tsx
@@ -74,6 +74,9 @@ export function SelectDataSource({ collection, onSelectDataSource }: SelectDataS
                     setSelectedTableId(tables[0]?.id ?? "")
                 } catch (error) {
                     console.error(error)
+
+                    if (abortController.signal.aborted) return
+
                     setStatus("error-tables")
 
                     const baseName = selectedBase?.name ?? selectedBaseId
diff --git a/plugins/airtable/src/data.ts b/plugins/airtable/src/data.ts
index 11ac73448..385829796 100644
--- a/plugins/airtable/src/data.ts
+++ b/plugins/airtable/src/data.ts
@@ -311,12 +311,34 @@ export function getFieldDataEntryForFieldSchema(
     }
 }
 
-export async function getItems(dataSource: DataSource, slugFieldId: string) {
-    const items = await fetchRecords(dataSource.baseId, dataSource.tableId)
+export function isUnchangedSinceLastSync(lastModifiedTime: string, lastSyncedTime: string | null): boolean {
+    if (!lastSyncedTime) return false
+
+    const lastModified = new Date(lastModifiedTime)
+    const lastSynced = new Date(lastSyncedTime)
+
+    return lastSynced > lastModified
+}
+
+export async function getItems(dataSource: DataSource, slugFieldId: string, lastSyncedTime: string | null) {
+    const records = await fetchRecords(dataSource.baseId, dataSource.tableId)
     const fieldsById = new Map(dataSource.fields.map(field => [field.id, field]))
+
+    const lastModifiedTimeFieldId = dataSource.fields.find(f => f.airtableType === "lastModifiedTime")?.id ?? null
+
+    const allRecordIds: string[] = []
     const itemsData: { id: string; slugValue: string; fieldData: FieldDataInput }[] = []
 
-    for (const item of items) {
+    for (const item of records) {
+        allRecordIds.push(item.id)
+
+        if (lastSyncedTime && lastModifiedTimeFieldId) {
+            const lastModifiedValue = item.fields[lastModifiedTimeFieldId]
+            if (typeof lastModifiedValue === "string" && isUnchangedSinceLastSync(lastModifiedValue, lastSyncedTime)) {
+                continue
+            }
+        }
+
         const fieldData: FieldDataInput = {}
 
         for (const fieldSchema of dataSource.fields) {
@@ -418,7 +440,7 @@ export async function getItems(dataSource: DataSource, slugFieldId: string) {
         itemsData.push({ id: item.id, slugValue: slugify(slugField.value as string), fieldData })
     }
 
-    return itemsData
+    return { items: itemsData, allRecordIds }
 }
 
 export interface DataSource {
@@ -474,10 +496,19 @@ export async function syncCollection(
     previousLastSynced: string | null,
     syncStartedAtDate: string
 ) {
-    const dataSourceItems = await getItems({ ...dataSource, fields }, slugFieldId)
+    const { items: dataSourceItems, allRecordIds } = await getItems(
+        { ...dataSource, fields },
+        slugFieldId,
+        previousLastSynced
+    )
     const items: ManagedCollectionItemInput[] = []
     const unsyncedItems = new Set(await collection.getItemIds())
 
+    // Remove all fetched record IDs from unsyncedItems so unchanged items are not deleted
+    for (const recordId of allRecordIds) {
+        unsyncedItems.delete(recordId)
+    }
+
     for (const item of dataSourceItems) {
         items.push({
             id: item.id,
@@ -485,8 +516,6 @@ export async function syncCollection(
             draft: false,
             fieldData: item.fieldData,
         })
-
-        unsyncedItems.delete(item.id)
     }
 
     // Find duplicate slugs and report error if any are found
@@ -507,8 +536,14 @@ export async function syncCollection(
         throw new Error(`Duplicate slug${pluralSuffix} found: ${slugList}. Each item must have a unique slug.`)
     }
 
-    await collection.removeItems(Array.from(unsyncedItems))
-    await collection.addItems(items)
+    const itemsToRemove = Array.from(unsyncedItems)
+    if (itemsToRemove.length > 0) {
+        await collection.removeItems(itemsToRemove)
+    }
+    if (items.length > 0) {
+        await collection.addItems(items)
+    }
+    await collection.setItemOrder(allRecordIds)
 
     await Promise.all([
         collection.setPluginData(PLUGIN_KEYS.BASE_ID, dataSource.baseId),
@@ -522,6 +557,7 @@ export async function syncCollection(
 export const syncMethods = [
     "ManagedCollection.removeItems",
     "ManagedCollection.addItems",
+    "ManagedCollection.setItemOrder",
     "ManagedCollection.setPluginData",
 ] as const satisfies ProtectedMethod[]
 

From 551bbe4dc6c88929e2bf56e883b011c41830471c Mon Sep 17 00:00:00 2001
From: Isaac Roberts <119639439+madebyisaacr@users.noreply.github.com>
Date: Thu, 19 Feb 2026 15:05:12 -0500
Subject: [PATCH 4/5] Fix note icon responsiveness

---
 plugins/airtable/src/App.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/airtable/src/App.css b/plugins/airtable/src/App.css
index f260997c4..0ac6de992 100644
--- a/plugins/airtable/src/App.css
+++ b/plugins/airtable/src/App.css
@@ -229,10 +229,15 @@ select:not(:disabled) {
 .note {
     display: flex;
     flex-direction: row;
-    align-items: center;
+    align-items: start;
     justify-content: left;
     gap: 14px;
     width: 100%;
     padding-left: 4px;
     color: var(--framer-color-text-tertiary);
 }
+
+.note svg {
+    margin-top: 3px;
+    flex-shrink: 0;
+}

From 54c76a49254a3d9d35ea12d1f8da11900e340d53 Mon Sep 17 00:00:00 2001
From: Isaac Roberts <119639439+madebyisaacr@users.noreply.github.com>
Date: Thu, 19 Feb 2026 15:12:46 -0500
Subject: [PATCH 5/5] Only consider full last modified time fields

---
 plugins/airtable/src/FieldMapping.tsx |  4 ++--
 plugins/airtable/src/data.ts          | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/airtable/src/FieldMapping.tsx b/plugins/airtable/src/FieldMapping.tsx
index 3bbfe950e..6229e09eb 100644
--- a/plugins/airtable/src/FieldMapping.tsx
+++ b/plugins/airtable/src/FieldMapping.tsx
@@ -2,7 +2,7 @@ import type { Field, ManagedCollection, ManagedCollectionField, ManagedCollectio
 import { FramerPluginClosedError, framer, useIsAllowedTo } from "framer-plugin"
 import { memo, useEffect, useMemo, useState } from "react"
 import type { DataSource } from "./data"
-import { mergeFieldsWithExistingFields, syncCollection, syncMethods } from "./data"
+import { isFullLastModifiedTimeField, mergeFieldsWithExistingFields, syncCollection, syncMethods } from "./data"
 import type { PossibleField } from "./fields"
 import { isCollectionReference } from "./utils"
 
@@ -166,7 +166,7 @@ export function FieldMapping({ collection, dataSource, initialSlugFieldId, previ
     const [fields, setFields] = useState(initialManagedCollectionFields)
     const [ignoredFieldIds, setIgnoredFieldIds] = useState(initialFieldIds)
 
-    const hasLastModifiedTimeField = dataSource.fields.some(field => field.airtableType === "lastModifiedTime")
+    const hasLastModifiedTimeField = dataSource.fields.some(isFullLastModifiedTimeField)
 
     // Create a map of field IDs to names for efficient lookup
     const originalFieldNameMap = useMemo(
diff --git a/plugins/airtable/src/data.ts b/plugins/airtable/src/data.ts
index 385829796..6221074b6 100644
--- a/plugins/airtable/src/data.ts
+++ b/plugins/airtable/src/data.ts
@@ -311,6 +311,18 @@ export function getFieldDataEntryForFieldSchema(
     }
 }
 
+/**
+ * Returns true if the field is a last modified time field that tracks all fields
+ * in the base (i.e. referencedFieldIds is null or empty). Fields that only track
+ * specific columns are not reliable enough to use for sync optimization.
+ */
+export function isFullLastModifiedTimeField(field: PossibleField): boolean {
+    if (field.airtableType !== "lastModifiedTime") return false
+    const options = field.airtableOptions as { isValid?: boolean; referencedFieldIds?: string[] | null } | undefined
+    const referencedFieldIds = options?.referencedFieldIds
+    return options?.isValid === true && (referencedFieldIds == null || referencedFieldIds.length === 0)
+}
+
 export function isUnchangedSinceLastSync(lastModifiedTime: string, lastSyncedTime: string | null): boolean {
     if (!lastSyncedTime) return false
 
@@ -324,7 +336,7 @@ export async function getItems(dataSource: DataSource, slugFieldId: string, last
     const records = await fetchRecords(dataSource.baseId, dataSource.tableId)
     const fieldsById = new Map(dataSource.fields.map(field => [field.id, field]))
 
-    const lastModifiedTimeFieldId = dataSource.fields.find(f => f.airtableType === "lastModifiedTime")?.id ?? null
+    const lastModifiedTimeFieldId = dataSource.fields.find(isFullLastModifiedTimeField)?.id ?? null
 
     const allRecordIds: string[] = []
     const itemsData: { id: string; slugValue: string; fieldData: FieldDataInput }[] = []