slidev-theme-gtlabo 2.1.0 → 2.1.2

package/components/Citation.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script setup>
-import { computed, onMounted, onUnmounted, inject } from 'vue'
+import { computed, inject, onMounted, onUnmounted } from 'vue'
 import { useSlideContext } from '@slidev/client'
 
 const { $slidev, $page } = useSlideContext()
@@ -32,65 +32,37 @@ const props = defineProps({
   }
 })
 
-// グローバル引用管理の初期化
-if (!window.citationManager) {
-  window.citationManager = {
-    citations: new Map(),           // id -> { number, data, formatted }
-    citationKeys: [],               // frontmatterのキーの順番
-    pageCitations: new Map(),       // pageNumber -> Set of citation ids
-    initialized: false,
-    listeners: new Set()            // 更新通知用リスナー
+// ページごとの引用管理（slide-bottom.vue用）
+if (!window.pageCitations) {
+  window.pageCitations = {
+    data: new Map(),  // pageNumber -> Set of citation ids
+    listeners: new Set()
   }
 }
 
-// 更新を通知する関数
 const notifyListeners = () => {
-  window.citationManager.listeners.forEach(listener => {
-    try {
-      listener()
-    } catch (e) {
-      // リスナーエラーを無視
-    }
+  window.pageCitations.listeners.forEach(listener => {
+    try { listener() } catch (e) { /* ignore */ }
   })
 }
 
-// frontmatterの順番でcitation番号を事前に割り当て
-const initializeCitations = () => {
-  if (!window.citationManager.initialized) {
-    window.citationManager.citationKeys = Object.keys(citations)
-    
-    window.citationManager.citationKeys.forEach((key, index) => {
-      if (!window.citationManager.citations.has(key)) {
-        const data = citations[key]
-        const newCitation = {
-          number: index + 1,
-          data: data,
-          formatted: formatCitation(data)
-        }
-        window.citationManager.citations.set(key, newCitation)
-      }
-    })
-    
-    window.citationManager.initialized = true
-  }
-}
-
 // 引用データを取得
 const citationData = computed(() => {
-  return citations[props.id] || null
+  return citations.value[props.id] || null
 })
 
-// 引用番号を取得
+// 引用番号を取得（シンプル版：毎回計算）
 const citationNumber = computed(() => {
-  if (!citationData.value) {
+  const citationsData = citations.value
+  if (!citationsData || !citationData.value) {
     return '?'
   }
   
-  initializeCitations()
+  const keys = Object.keys(citationsData)
+  const index = keys.indexOf(props.id)
   
-  const citation = window.citationManager.citations.get(props.id)
-  if (citation) {
-    return citation.number
+  if (index >= 0) {
+    return index + 1
   }
   
   return '?'
@@ -101,12 +73,6 @@ const formattedCitation = computed(() => {
   if (!citationData.value) {
     return '引用情報が見つかりません'
   }
-  
-  const citation = window.citationManager.citations.get(props.id)
-  if (citation && citation.formatted) {
-    return citation.formatted
-  }
-  
   return formatCitation(citationData.value)
 })
 
@@ -161,17 +127,16 @@ const formatCitation = (data) => {
   return citation || '引用情報が不完全です'
 }
 
-// 現在のページに引用を登録
+// 現在のページに引用を登録（slide-bottom.vue用）
 const registerCitation = () => {
-  // $page はこのコンポーネントが配置されているスライドの番号（静的）
   const page = $page
   if (!page) return
   
-  if (!window.citationManager.pageCitations.has(page)) {
-    window.citationManager.pageCitations.set(page, new Set())
+  if (!window.pageCitations.data.has(page)) {
+    window.pageCitations.data.set(page, new Set())
   }
   
-  const pageSet = window.citationManager.pageCitations.get(page)
+  const pageSet = window.pageCitations.data.get(page)
   if (!pageSet.has(props.id)) {
     pageSet.add(props.id)
     notifyListeners()
@@ -183,18 +148,17 @@ const unregisterCitation = () => {
   const page = $page
   if (!page) return
   
-  const pageSet = window.citationManager.pageCitations.get(page)
+  const pageSet = window.pageCitations.data.get(page)
   if (pageSet) {
     pageSet.delete(props.id)
     if (pageSet.size === 0) {
-      window.citationManager.pageCitations.delete(page)
+      window.pageCitations.data.delete(page)
     }
     notifyListeners()
   }
 }
 
 onMounted(() => {
-  initializeCitations()
   registerCitation()
 })
 

package/components/CitationListPage.vue

@@ -147,12 +147,23 @@
 </template>
   
 <script setup>
-import { computed } from 'vue'
+import { computed, inject } from 'vue'
 import { useSlideContext } from '@slidev/client'
 
 // Slidevコンテキストからconfigsにアクセス
 const { $slidev } = useSlideContext()
-const citations = $slidev.configs.citations || {}
+
+// 方法1: frontmatterから取得（従来通り）
+const frontmatterCitations = $slidev.configs.citations || {}
+
+// 方法2: injectから取得（外部ファイル対応）
+const injectedCitations = inject('citations', {})
+
+// 両方をマージ（frontmatter優先）
+const citations = computed(() => ({
+  ...injectedCitations,
+  ...frontmatterCitations
+}))
 
 // プロパティ定義
 const props = defineProps({
@@ -177,16 +188,17 @@ const props = defineProps({
 
 // 参考文献リストを生成（frontmatterの順番を維持）
 const citationsList = computed(() => {
-  if (!citations || typeof citations !== 'object') {
+  const citationsData = citations.value
+  if (!citationsData || typeof citationsData !== 'object') {
     return []
   }
   
   // frontmatterの記述順でキーを取得
-  const originalKeys = Object.keys(citations)
+  const originalKeys = Object.keys(citationsData)
   
   const list = originalKeys.map((key, index) => ({
     key,
-    data: citations[key],
+    data: citationsData[key],
     number: index + 1 // frontmatterの順番に基づく番号
   }))
   

package/components/SectionDivider.vue

@@ -1,4 +1,4 @@
-<!-- components/TableOfContents.vue -->
+<!-- components/SectionDivider.vue -->
 <template>
   <div class="table-of-contents-container flex flex-col justify-start bg-white overflow-hidden relative">
     <!-- 厳密な背景グリッド - Swiss Styleの基礎 -->
@@ -160,12 +160,23 @@
 </template>
       
 <script setup>
-import { computed } from 'vue'
+import { computed, inject } from 'vue'
 import { useSlideContext } from '@slidev/client'
 
 // Slidevコンテキストからconfigsにアクセス
 const { $slidev } = useSlideContext()
-const chapters = $slidev.configs.chapters || {}
+
+// 方法1: frontmatterから取得（従来通り）
+const frontmatterChapters = $slidev.configs.chapters || {}
+
+// 方法2: injectから取得（外部ファイル対応）
+const injectedChapters = inject('chapters', {})
+
+// 両方をマージ（frontmatter優先）
+const chapters = computed(() => ({
+  ...injectedChapters,
+  ...frontmatterChapters
+}))
 
 const props = defineProps({
   nextChapter: {
@@ -188,7 +199,8 @@ const props = defineProps({
 
 // セクションの重複を除去する関数
 const getUniqueSections = (chapterKey) => {
-  const chapter = chapters[chapterKey]
+  const chaptersData = chapters.value
+  const chapter = chaptersData[chapterKey]
   if (!chapter?.sections) return []
   
   const sections = chapter.sections
@@ -221,14 +233,15 @@ const isAppendixSection = computed(() => {
 
 // 通常の章リスト（refと付録を除外）
 const regularChapters = computed(() => {
-  if (!chapters || typeof chapters !== 'object') {
+  const chaptersData = chapters.value
+  if (!chaptersData || typeof chaptersData !== 'object') {
     return []
   }
   
-  return Object.keys(chapters)
+  return Object.keys(chaptersData)
     .filter(chapterKey => chapterKey !== 'ref' && !chapterKey.startsWith('ap'))
     .map(chapterKey => {
-      const chapter = chapters[chapterKey]
+      const chapter = chaptersData[chapterKey]
       const sections = chapter?.sections || {}
       const sectionKeys = Object.keys(sections)
       
@@ -244,14 +257,15 @@ const regularChapters = computed(() => {
 
 // 付録の章リスト
 const appendixChapters = computed(() => {
-  if (!chapters || typeof chapters !== 'object') {
+  const chaptersData = chapters.value
+  if (!chaptersData || typeof chaptersData !== 'object') {
     return []
   }
   
-  return Object.keys(chapters)
+  return Object.keys(chaptersData)
     .filter(chapterKey => chapterKey.startsWith('ap'))
     .map(chapterKey => {
-      const chapter = chapters[chapterKey]
+      const chapter = chaptersData[chapterKey]
       const sections = chapter?.sections || {}
       const sectionKeys = Object.keys(sections)
       
@@ -267,7 +281,8 @@ const appendixChapters = computed(() => {
 
 // セクションタイトルを取得
 const getSectionTitle = (chapterKey, sectionKey) => {
-  const chapter = chapters[chapterKey]
+  const chaptersData = chapters.value
+  const chapter = chaptersData[chapterKey]
   const sectionData = chapter?.sections?.[sectionKey]
   return sectionData?.title || `セクション ${sectionKey}`
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slidev-theme-gtlabo",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "A Slidev theme for laboratory presentations with customizable components",
   "author": "mksmkss",
   "license": "MIT",

package/components/ChapterItem.vue

@@ -1,93 +0,0 @@
-<!-- components/ChapterItem.vue -->
-<template>
-  <div 
-    class="flex flex-col"
-    :class="isNext ? 'border-sky-500 border-l-8 pl-6' : 'border-slate-200 border-l-4 pl-7'"
-  >
-    <!-- 次の章インジケーター - sky-500アクセント -->
-    <div 
-      v-if="isNext"
-      :class="nextBadgeClasses"
-      class="bg-sky-500 text-white font-bold uppercase tracking-widest leading-none"
-    >
-      NEXT
-    </div>
-          
-    <!-- 章番号とタイトル - 左揃え、明確なヒエラルキー -->
-    <div :class="chapterHeaderClasses">
-      <div class="flex items-end space-x-3 w-full">
-        <div :class="chapterNumberClasses" class="flex text-slate-900 font-bold tabular-nums leading-none">
-          {{ chapterNumber }}
-        </div>
-        <div class="flex-1">
-          <div class="border-b border-slate-900 mb-2">
-            <span :class="chapterTitleClasses" class="text-slate-900 font-bold leading-tight">
-              {{ chapter.title }}
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-          
-    <!-- セクション一覧 - 機能的な情報構造 -->
-    <div :class="sectionListClasses">
-      <div 
-        v-for="(sectionData, sectionIndex) in chapter.uniqueSections" 
-        :key="`${chapter.key}-${sectionIndex}`"
-        class="flex items-start"
-      >
-        <span class="w-1 h-1 bg-slate-400 mr-2 mt-1.5 flex-shrink-0 rounded-full"></span>
-        <span :class="sectionTextClasses" class="text-slate-600 leading-snug">
-          {{ sectionData.title }}
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-const props = defineProps({
-  chapter: {
-    type: Object,
-    required: true
-  },
-  index: {
-    type: Number,
-    required: true
-  },
-  isNext: {
-    type: Boolean,
-    default: false
-  },
-  isAppendix: {
-    type: Boolean,
-    default: false
-  },
-  size: {
-    type: String,
-    default: 'md'
-  },
-  config: {
-    type: Object,
-    required: true
-  }
-})
-
-// 章番号の生成（通常章は "01", "02"、付録は "A1", "A2"）
-const chapterNumber = computed(() => {
-  if (props.isAppendix) {
-    return `A${props.index + 1}`
-  }
-  return String(props.index + 1).padStart(2, '0')
-})
-
-// 動的クラス
-const chapterHeaderClasses = computed(() => props.config.chapterHeader)
-const chapterNumberClasses = computed(() => props.config.chapterNumber)
-const chapterTitleClasses = computed(() => props.config.chapterTitle)
-const sectionListClasses = computed(() => props.config.sectionList)
-const sectionTextClasses = computed(() => props.config.sectionText)
-const nextBadgeClasses = computed(() => props.config.nextBadge)
-</script>