Merge remote-tracking branch 'upstream/HEAD' into apkg

pylib/anki/collection.py

@@ -853,6 +853,12 @@ class Collection(DeprecatedNamesMixin):
         return CollectionStats(self)
 
     def card_stats_data(self, card_id: CardId) -> stats_pb2.CardStatsResponse:
+        """Returns the data required to show card stats.
+
+        If you wish to display the stats in a HTML table like Anki does,
+        you can use the .js file directly - see this add-on for an example:
+        https://ankiweb.net/shared/info/2179254157
+        """
         return self._backend.card_stats(card_id)
 
     def studied_today(self) -> str:

pylib/anki/stats.py

@@ -39,7 +39,7 @@ def _legacy_card_stats(
     if ({1 if _legacy_nightmode else 0}) {{
         document.documentElement.className = "night-mode";
     }}
-    const {varName} = anki.cardInfo(document.getElementById('{random_id}'));
+    const {varName} = anki.setupCardInfo(document.getElementById('{random_id}'));
     {varName}.then((c) => c.$set({{ cardId: {card_id}, includeRevlog: {str(include_revlog).lower()} }}));
 </script>
     """

qt/aqt/browser/browser.py

@@ -353,6 +353,7 @@ class Browser(QMainWindow):
 
         self._lastSearchTxt = search
         prompt = search if prompt == None else prompt
+        self.form.searchEdit.setCurrentIndex(-1)
         self.form.searchEdit.lineEdit().setText(prompt)
         self.search()
 

qt/aqt/browser/card_info.py

@@ -63,6 +63,7 @@ class CardInfoDialog(QDialog):
         layout.addWidget(buttons)
         qconnect(buttons.rejected, self.reject)
         self.setLayout(layout)
+        self.web.eval("anki.cardInfoPromise = anki.setupCardInfo(document.body);")
         self.update_card(card_id)
 
     def update_card(self, card_id: CardId | None) -> None:

qt/aqt/editor.py

@@ -1343,7 +1343,7 @@ class EditorWebView(AnkiWebView):
             return
         html = mime.html()
         mime.setHtml(f"<!--anki-->{html}")
-        clip.setMimeData(mime)
+        aqt.mw.progress.timer(10, lambda: clip.setMimeData(mime), False, parent=self)
 
     def contextMenuEvent(self, evt: QContextMenuEvent) -> None:
         m = QMenu(self)

rslib/src/scheduler/reviews.rs

@@ -41,6 +41,7 @@ impl Card {
     }
 
     fn schedule_as_review(&mut self, interval: u32, due: i32, ease_factor: u16) {
+        self.original_position = self.last_position();
         self.remove_from_filtered_deck_before_reschedule();
         self.interval = interval.max(1);
         self.due = due;

ts/card-info/index.ts

@@ -11,17 +11,17 @@ const i18n = setupI18n({
     modules: [ModuleName.CARD_STATS, ModuleName.SCHEDULING, ModuleName.STATISTICS],
 });
 
-export async function setupCardInfo(): Promise<CardInfo> {
+export async function setupCardInfo(target: HTMLElement): Promise<CardInfo> {
     checkNightMode();
     await i18n;
 
-    return new CardInfo({ target: document.body, props: { includeRevlog: true } });
+    return new CardInfo({ target, props: {} });
 }
 
-export const cardInfoPromise = setupCardInfo();
-
 if (window.location.hash.startsWith("#test")) {
     // use #testXXXX where XXXX is card ID to test
     const cardId = parseInt(window.location.hash.substr("#test".length), 10);
-    cardInfoPromise.then((cardInfo: CardInfo): void => cardInfo.$set({ cardId }));
+    setupCardInfo(document.body).then((cardInfo: CardInfo): void =>
+        cardInfo.$set({ cardId }),
+    );
 }