django-spire 0.23.6__py3-none-any.whl → 0.23.8__py3-none-any.whl

django_spire/core/tag/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Sequence, Self
 
 from django.db import models

django_spire/core/tag/querysets.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.db.models import QuerySet
 from django.utils.text import slugify
 

django_spire/core/tag/service/tag_service.py

@@ -1,7 +1,7 @@
-from abc import abstractmethod, ABC
-from typing import Generic
+from __future__ import annotations
 
-from django.db.models import QuerySet
+from abc import abstractmethod, ABC
+from typing import Generic, TYPE_CHECKING
 
 from django_spire.contrib.constructor.django_model_constructor import TypeDjangoModel
 from django_spire.contrib.service import BaseDjangoModelService
@@ -9,6 +9,9 @@ from django_spire.core.tag import tools
 from django_spire.core.tag.models import Tag
 from django_spire.core.tag.tools import get_score_percentage_from_tag_set_weighted
 
+if TYPE_CHECKING:
+    from django.db.models import QuerySet
+
 
 class BaseTagService(
     BaseDjangoModelService[TypeDjangoModel],

django_spire/core/tag/tests/test_intelligence.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 from unittest import TestCase
 
 from django_spire.core.tag.intelligence.tag_set_bot import TagSetBot
 
+
 TEST_INPUT = """
     I love reading books about science fiction, fantasy, and adventure, especially ones
     that feature artificial intelligence, machine learning, and natural language processing.
@@ -13,16 +16,13 @@ TEST_INPUT = """
 
 
 class TestTagIntelligence(TestCase):
-    def setUp(self):
-        pass
-
     def test_tag_set_bot(self):
         tag_set = TagSetBot().process(TEST_INPUT)
 
-        self.assertIn('science', tag_set)
-        self.assertIn('artificial', tag_set)
-        self.assertIn('fantasy', tag_set)
+        assert 'science' in tag_set
+        assert 'artificial' in tag_set
+        assert 'fantasy' in tag_set
 
-        self.assertNotIn('camping', tag_set)
-        self.assertNotIn('art', tag_set)
-        self.assertNotIn('hate', tag_set)
+        assert 'camping' not in tag_set
+        assert 'art' not in tag_set
+        assert 'hate' not in tag_set

django_spire/core/tag/tests/test_tags.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.test import TestCase
 
 from django_spire.core.tag.models import Tag
@@ -5,9 +7,10 @@ from django_spire.knowledge.collection.models import Collection
 
 
 class TestTags(TestCase):
-    def setUp(self):
+    def setUp(self) -> None:
         self.collection = Collection.objects.create(
-            name='Test Collection', description='Test Collection Description'
+            name='Test Collection',
+            description='Test Collection Description'
         )
 
         self.tag_set_a = {'apple', 'banana', 'orange'}
@@ -26,77 +29,64 @@ class TestTags(TestCase):
 
         self.collection.services.tag.add_tags_from_tag_set(self.dirty_tag_set)
 
-    def test_tag_removal(self):
-        self.assertIn('apple', self.collection.tag_set)
-
-        self.collection.services.tag.remove_tags_by_tag_set(self.mixed_tag_set)
-
-        self.assertNotIn('lemon', self.collection.tag_set)
+    def test_tag_add_and_set(self) -> None:
+        self.collection.services.tag.set_tags_from_tag_set(self.mixed_tag_set)
 
-        self.assertIn('kiwi', self.collection.tag_set)
+        assert 'lemon' in self.collection.tag_set
+        assert 'banana' not in self.collection.tag_set
 
-    def test_tag_add_and_set(self):
-        self.collection.services.tag.set_tags_from_tag_set(self.mixed_tag_set)
+    def test_tag_bool_methods(self) -> None:
+        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_b)
 
-        self.assertIn('lemon', self.collection.tag_set)
+        assert self.collection.services.tag.has_tags_in_tag_set(self.tag_set_c) is True
+        assert self.collection.services.tag.has_tags_in_tag_set(self.mixed_tag_set) is False
 
-        self.assertNotIn('banana', self.collection.tag_set)
+    def test_tag_count(self) -> None:
+        assert Tag.objects.count() == 12
+        assert self.collection.tags.count() == 12
 
-    def test_tag_count(self):
-        self.assertEqual(Tag.objects.count(), 12)
-        self.assertEqual(self.collection.tags.count(), 12)
+    def test_tag_matching_methods(self) -> None:
+        assert len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_a)) == 3
 
-    def test_tag_removal(self):
         self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_a)
 
-        self.assertEqual(self.collection.tags.count(), 9)
+        assert len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_a)) == 0
+        assert len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_b)) == 3
+        assert len(self.collection.services.tag.get_matching_tags_from_tag_set(self.mixed_tag_set)) == 2
 
-    def test_tag_bool_methods(self):
         self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_b)
 
-        self.assertTrue(self.collection.services.tag.has_tags_in_tag_set(self.tag_set_c))
-        self.assertFalse(self.collection.services.tag.has_tags_in_tag_set(self.mixed_tag_set))
-
-    def test_tag_matching_methods(self):
-        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_a)), 3)
-
-        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_a)
+        assert len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_b)) == 0
+        assert len(self.collection.services.tag.get_matching_tags_from_tag_set(self.mixed_tag_set)) == 1
 
-        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_a)), 0)
-        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_b)), 3)
-        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.mixed_tag_set)), 2)
+    def test_tag_metric_methods(self) -> None:
+        assert abs(
+            self.collection.services.tag.get_matching_percentage_of_tag_set(self.tag_set_a) - 1.00
+        ) < 0.01
 
-        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_b)
+        assert abs(
+            self.collection.services.tag.get_matching_percentage_of_model_tags_from_tag_set(self.tag_set_b) - 0.25
+        ) < 0.01
 
-        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.tag_set_b)), 0)
+        self.collection.services.tag.remove_tags_by_tag_set(self.mixed_tag_set)
 
-        self.assertEqual(len(self.collection.services.tag.get_matching_tags_from_tag_set(self.mixed_tag_set)), 1)
+        assert abs(
+            self.collection.services.tag.get_matching_percentage_of_tag_set(self.tag_set_a) - 0.666
+        ) < 0.01
 
-    def test_tag_metric_methods(self):
-        self.assertAlmostEqual(
-            self.collection.services.tag.get_matching_percentage_of_tag_set(self.tag_set_a),
-            1.00,
-            2
-        )
+        assert abs(
+            self.collection.services.tag.get_matching_percentage_of_model_tags_from_tag_set(self.tag_set_b) - 0.222
+        ) < 0.01
 
-        self.assertAlmostEqual(
-            self.collection.services.tag.get_matching_percentage_of_model_tags_from_tag_set(self.tag_set_b),
-            0.25,
-            2
-        )
+    def test_tag_removal(self) -> None:
+        assert 'apple' in self.collection.tag_set
 
         self.collection.services.tag.remove_tags_by_tag_set(self.mixed_tag_set)
 
-        self.assertAlmostEqual(
-            self.collection.services.tag.get_matching_percentage_of_tag_set(self.tag_set_a),
-            0.666,
-            2
-        )
-
+        assert 'lemon' not in self.collection.tag_set
+        assert 'kiwi' in self.collection.tag_set
 
-        self.assertAlmostEqual(
-            self.collection.services.tag.get_matching_percentage_of_model_tags_from_tag_set(self.tag_set_b),
-            0.222,
-            2
-        )
+    def test_tag_removal_count(self) -> None:
+        self.collection.services.tag.remove_tags_by_tag_set(self.tag_set_a)
 
+        assert self.collection.tags.count() == 9

django_spire/core/tag/tests/test_tools.py

@@ -0,0 +1,191 @@
+from __future__ import annotations
+
+from unittest import TestCase
+
+from django_spire.core.tag.tools import (
+    get_matching_a_percentage_from_tag_sets,
+    get_matching_b_percentage_from_tag_sets,
+    get_matching_count_from_tag_sets,
+    get_matching_tag_set_from_tag_sets,
+    get_score_percentage_from_tag_set_weighted,
+    simplify_and_weight_tag_set_to_dict,
+    simplify_tag_set,
+    simplify_tag_set_to_list,
+)
+
+
+class TestGetMatchingTagSetFromTagSets(TestCase):
+    def test_full_intersection(self) -> None:
+        tag_set_a = {'apple', 'banana', 'orange'}
+        tag_set_b = {'apple', 'banana', 'orange'}
+
+        result = get_matching_tag_set_from_tag_sets(tag_set_a, tag_set_b)
+
+        assert result == {'apple', 'banana', 'orange'}
+
+    def test_no_intersection(self) -> None:
+        tag_set_a = {'apple', 'banana', 'orange'}
+        tag_set_b = {'grape', 'kiwi', 'pear'}
+
+        result = get_matching_tag_set_from_tag_sets(tag_set_a, tag_set_b)
+
+        assert result == set()
+
+    def test_partial_intersection(self) -> None:
+        tag_set_a = {'apple', 'banana', 'orange'}
+        tag_set_b = {'apple', 'grape', 'kiwi'}
+
+        result = get_matching_tag_set_from_tag_sets(tag_set_a, tag_set_b)
+
+        assert result == {'apple'}
+
+
+class TestGetMatchingCountFromTagSets(TestCase):
+    def test_full_match(self) -> None:
+        tag_set_a = {'apple', 'banana'}
+        tag_set_b = {'apple', 'banana'}
+
+        assert get_matching_count_from_tag_sets(tag_set_a, tag_set_b) == 2
+
+    def test_no_match(self) -> None:
+        tag_set_a = {'apple', 'banana'}
+        tag_set_b = {'grape', 'kiwi'}
+
+        assert get_matching_count_from_tag_sets(tag_set_a, tag_set_b) == 0
+
+    def test_partial_match(self) -> None:
+        tag_set_a = {'apple', 'banana', 'orange'}
+        tag_set_b = {'apple', 'grape'}
+
+        assert get_matching_count_from_tag_sets(tag_set_a, tag_set_b) == 1
+
+
+class TestGetMatchingAPercentageFromTagSets(TestCase):
+    def test_empty_tag_set_a(self) -> None:
+        tag_set_a = set()
+        tag_set_b = {'apple', 'banana'}
+
+        assert get_matching_a_percentage_from_tag_sets(tag_set_a, tag_set_b) == 0.0
+
+    def test_full_match(self) -> None:
+        tag_set_a = {'apple', 'banana'}
+        tag_set_b = {'apple', 'banana', 'orange'}
+
+        assert get_matching_a_percentage_from_tag_sets(tag_set_a, tag_set_b) == 1.0
+
+    def test_partial_match(self) -> None:
+        tag_set_a = {'apple', 'banana', 'orange'}
+        tag_set_b = {'apple'}
+
+        assert abs(get_matching_a_percentage_from_tag_sets(tag_set_a, tag_set_b) - 0.333) < 0.01
+
+
+class TestGetMatchingBPercentageFromTagSets(TestCase):
+    def test_empty_tag_set_b(self) -> None:
+        tag_set_a = {'apple', 'banana'}
+        tag_set_b = set()
+
+        assert get_matching_b_percentage_from_tag_sets(tag_set_a, tag_set_b) == 0.0
+
+    def test_full_match(self) -> None:
+        tag_set_a = {'apple', 'banana', 'orange'}
+        tag_set_b = {'apple', 'banana'}
+
+        assert get_matching_b_percentage_from_tag_sets(tag_set_a, tag_set_b) == 1.0
+
+    def test_partial_match(self) -> None:
+        tag_set_a = {'apple'}
+        tag_set_b = {'apple', 'banana', 'orange'}
+
+        assert abs(get_matching_b_percentage_from_tag_sets(tag_set_a, tag_set_b) - 0.333) < 0.01
+
+
+class TestSimplifyTagSet(TestCase):
+    def test_no_hyphens(self) -> None:
+        tag_set = {'apple', 'banana', 'orange'}
+
+        result = simplify_tag_set(tag_set)
+
+        assert result == {'apple', 'banana', 'orange'}
+
+    def test_with_hyphens(self) -> None:
+        tag_set = {'machine-learning', 'data-science'}
+
+        result = simplify_tag_set(tag_set)
+
+        assert 'machine' in result
+        assert 'learning' in result
+        assert 'data' in result
+        assert 'science' in result
+
+
+class TestSimplifyTagSetToList(TestCase):
+    def test_mixed_tags(self) -> None:
+        tag_set = {'apple', 'machine-learning'}
+
+        result = simplify_tag_set_to_list(tag_set)
+
+        assert 'apple' in result
+        assert 'machine' in result
+        assert 'learning' in result
+
+    def test_with_hyphens(self) -> None:
+        tag_set = {'machine-learning'}
+
+        result = simplify_tag_set_to_list(tag_set)
+
+        assert result == ['machine', 'learning']
+
+
+class TestSimplifyAndWeightTagSetToDict(TestCase):
+    def test_duplicate_words(self) -> None:
+        tag_set = {'machine-learning', 'deep-learning'}
+
+        result = simplify_and_weight_tag_set_to_dict(tag_set)
+
+        assert result['learning'] == 2
+        assert result['machine'] == 1
+        assert result['deep'] == 1
+
+    def test_simple_tags(self) -> None:
+        tag_set = {'apple', 'banana'}
+
+        result = simplify_and_weight_tag_set_to_dict(tag_set)
+
+        assert result['apple'] == 1
+        assert result['banana'] == 1
+
+    def test_sorted_by_weight(self) -> None:
+        tag_set = {'machine-learning', 'deep-learning', 'learning'}
+
+        result = simplify_and_weight_tag_set_to_dict(tag_set)
+        keys = list(result.keys())
+
+        assert keys[0] == 'learning'
+        assert result['learning'] == 3
+
+
+class TestGetScorePercentageFromTagSetWeighted(TestCase):
+    def test_empty_reference(self) -> None:
+        tag_set_actual = {'apple', 'banana'}
+        tag_set_reference = set()
+
+        result = get_score_percentage_from_tag_set_weighted(tag_set_actual, tag_set_reference)
+
+        assert result == 0.0
+
+    def test_no_match(self) -> None:
+        tag_set_actual = {'grape', 'kiwi'}
+        tag_set_reference = {'apple', 'banana'}
+
+        result = get_score_percentage_from_tag_set_weighted(tag_set_actual, tag_set_reference)
+
+        assert result == 0.0
+
+    def test_with_weighted_match(self) -> None:
+        tag_set_actual = {'machine-learning', 'learning'}
+        tag_set_reference = {'machine-learning', 'deep-learning'}
+
+        result = get_score_percentage_from_tag_set_weighted(tag_set_actual, tag_set_reference)
+
+        assert result > 0

django_spire/core/tag/tools.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 def get_matching_tag_set_from_tag_sets(tag_set_a: set[str], tag_set_b: set[str]) -> set[str]:
     return tag_set_a.intersection(tag_set_b)
 

django_spire/core/templates/django_spire/card/card.html

@@ -1,5 +1,8 @@
-<div class="card ms-0 shadow-sm rounded-3 bg-app-layer-two {% block card_class %}{% endblock %}">
-    <div class="{% block card_padding %}p-3{% endblock %}">
+<div
+    class="card ms-0 shadow-sm rounded-3 bg-app-layer-two {% block card_class %}{% endblock %}"
+    style="{% block card_style %}{% endblock %}"
+>
+    <div class="{% block card_padding %}p-3{% endblock %}" style="{% block card_body_style %}{% endblock %}">
         {% block card_content %}{% endblock %}
     </div>
 

django_spire/core/templates/django_spire/card/title_card.html

@@ -1,7 +1,12 @@
 {% extends 'django_spire/card/card.html' %}
 
+{% block card_padding %}p-3 h-100{% endblock %}
+
+{% block card_body_style %}display: flex; flex-direction: column; overflow: hidden;{% endblock %}
+
 {% block card_content %}
     <div
+        class="d-flex flex-column flex-grow-1 overflow-hidden"
         x-data="{
             card_title_dropdown: false,
             toggle_card_title_dropdown() {
@@ -9,8 +14,8 @@
             }
         }"
     >
-        <div class="row justify-content-between align-items-center mb-2 pb-2 border-bottom">
-            <div class="col">
+        <div class="row justify-content-between align-items-center mb-2 pb-2 border-bottom flex-shrink-0" style="min-height: 38px;">
+            <div class="col d-flex align-items-center">
                 <div class="card-title text-uppercase mb-0">
                     {% block card_title %}
                     {% endblock %}
@@ -20,11 +25,11 @@
                 {% block card_button %}{% endblock %}
             </div>
         </div>
-        <div x-show="card_title_dropdown" x-cloak x-collapse>
+        <div x-show="card_title_dropdown" x-cloak x-collapse class="flex-shrink-0">
             {% block card_dropdown_content %}
             {% endblock %}
         </div>
-        <div style="{% block card_title_content_style %}{% endblock %}">
+        <div class="flex-grow-1 overflow-hidden" style="{% block card_title_content_style %}{% endblock %}">
             {% block card_title_content %}
             {% endblock %}
         </div>

django_spire/core/templates/django_spire/infinite_scroll/base.html

@@ -1,4 +1,5 @@
 <div
+    class="{% block scroll_wrapper_class %}{% endblock %}"
     x-data="{
         batch_size: parseInt('{{ batch_size|default:50 }}'),
         current_page: parseInt('{{ current_page|default:0 }}'),

django_spire/core/templates/django_spire/navigation/side_navigation.html

@@ -1,8 +1,21 @@
 {% load static %}
 
 <div
-    class="navbar sticky-top bg-app-side-navigation d-block"
-    style="width: 100%; height: 100vh"
+    class="navbar sticky-top bg-app-side-navigation d-block w-100 vh-100"
+    x-data="{
+        show_top_fade: false,
+        show_bottom_fade: false,
+
+        check_scroll() {
+            let element = this.$refs.scroll_container;
+            let has_scroll = element.scrollHeight > element.clientHeight;
+            let is_at_top = element.scrollTop <= 20;
+            let is_at_bottom = element.scrollHeight - element.scrollTop <= element.clientHeight + 20;
+            this.show_top_fade = has_scroll && !is_at_top;
+            this.show_bottom_fade = has_scroll && !is_at_bottom;
+        }
+    }"
+    x-init="$nextTick(() => { check_scroll(); window.addEventListener('resize', () => check_scroll()); })"
 >
     <div class="text-center pt-2">
         {% block side_navigation_top_content %}
@@ -20,32 +33,15 @@
         {% endblock %}
     </div>
 
-    <div
-        class="position-relative"
-        style="height: calc(100vh - var(--app-side-navigation-top-content-height));"
-        x-data="{
-            show_top_fade: false,
-            show_bottom_fade: false,
-            check_scroll() {
-                let element = this.$refs.scroll_container;
-                let has_scroll = element.scrollHeight > element.clientHeight;
-                let is_at_top = element.scrollTop <= 20;
-                let is_at_bottom = element.scrollHeight - element.scrollTop <= element.clientHeight + 20;
-                this.show_top_fade = has_scroll && !is_at_top;
-                this.show_bottom_fade = has_scroll && !is_at_bottom;
-            }
-        }"
-        x-init="$nextTick(() => { check_scroll(); window.addEventListener('resize', () => check_scroll()); })"
-    >
+    <div class="position-relative">
         <div
-            class="position-absolute top-0 start-0 w-100 side-navigation-fade-top"
-            style="z-index: 10;"
+            class="position-absolute top-0 start-0 w-100 z-1 side-navigation-fade-top"
             x-show="show_top_fade"
         >
         </div>
 
         <div
-            class="navbar-nav-scroll scrollbar-hidden px-2 pb-4 h-100"
+            class="navbar-nav-scroll scrollbar-hidden px-2 px-1 h-100"
             x-ref="scroll_container"
             @scroll="check_scroll()"
         >
@@ -55,8 +51,7 @@
         </div>
 
         <div
-            class="position-absolute bottom-0 start-0 w-100 side-navigation-fade-bottom"
-            style="z-index: 10;"
+            class="position-absolute bottom-0 start-0 w-100 z-1 side-navigation-fade-bottom"
             x-show="show_bottom_fade"
         >
         </div>

django_spire/core/templates/django_spire/page/full_page.html

@@ -37,11 +37,29 @@
             sub_nav_max_width: 600,
             sub_nav_min_width: 300,
             sub_nav_width: 300,
+            sub_toggle_left: 8,
 
             is_touch_device() {
                 return window.matchMedia('(pointer: coarse)').matches || 'ontouchstart' in window;
             },
 
+            show_sub_toggle() {
+                return has_content(this.$refs.full_page_sub_navigation) && !this.show_sub_nav && !((this.is_mobile && this.is_narrow_viewport) && this.show_info_nav);
+            },
+
+            show_info_toggle() {
+                return has_content(this.$refs.full_page_info_navigation) && !this.show_info_nav && !((this.is_mobile && this.is_narrow_viewport) && this.show_sub_nav);
+            },
+
+            update_toggle_position() {
+                let side_nav = document.querySelector('.side-navigation');
+                if (side_nav && window.innerWidth >= 992) {
+                    this.sub_toggle_left = side_nav.offsetWidth;
+                } else {
+                    this.sub_toggle_left = 8;
+                }
+            },
+
             update_viewport_state() {
                 const was_narrow = this.is_narrow_viewport;
                 const is_now_narrow = window.innerWidth < 992;
@@ -67,6 +85,7 @@
             init() {
                 this.is_mobile = this.is_touch_device();
                 this.update_viewport_state();
+                this.update_toggle_position();
 
                 const urlParams = new URLSearchParams(window.location.search);
 
@@ -82,6 +101,7 @@
 
                 window.addEventListener('resize', () => {
                     this.update_viewport_state();
+                    this.update_toggle_position();
                 })
             },
 
@@ -169,8 +189,10 @@
                                     {% block full_page_sub_navigation_buttons %}
                                     {% endblock %}
                                 </div>
-                                <div class="col-auto px-1">
-                                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-x-lg' x_button_click='close_sub()' %}
+                                <div class="col-auto px-2">
+                                    <a role="button" class="link-secondary" @click="close_sub()">
+                                        <i class="bi bi-x-lg"></i>
+                                    </a>
                                 </div>
                             </div>
 
@@ -195,14 +217,21 @@
                     </div>
                 </div>
 
+                <template x-if="show_sub_toggle()">
+                    <div
+                        class="panel-toggle-container"
+                        :style="{ left: sub_toggle_left + 'px' }"
+                    >
+                        {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-chevron-right' x_button_click='toggle_sub()' %}
+                    </div>
+                </template>
+
                 <div
-                    class="panel-toggle-container panel-toggle-container-left"
-                    x-show="has_content($refs.full_page_sub_navigation) && !show_sub_nav && !((is_mobile && is_narrow_viewport) && show_info_nav)"
+                    class="col pb-2"
+                    :class="{
+                        'ps-5': show_sub_toggle(),
+                    }"
                 >
-                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-chevron-right' x_button_click='toggle_sub()' %}
-                </div>
-
-                <div class="col">
                     {% block full_page_content %}
                     {% endblock %}
 
@@ -210,12 +239,11 @@
                     {% endblock %}
                 </div>
 
-                <div
-                    class="col-auto panel-toggle-container panel-toggle-container-right"
-                    x-show="has_content($refs.full_page_info_navigation) && !show_info_nav && !((is_mobile && is_narrow_viewport) && show_sub_nav)"
-                >
-                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-chevron-left' x_button_click='toggle_info()' %}
-                </div>
+                <template x-if="show_info_toggle()">
+                    <div class="panel-toggle-container panel-toggle-container-right">
+                        {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-chevron-left' x_button_click='toggle_info()' %}
+                    </div>
+                </template>
 
                 <div
                     :class="(is_mobile && is_narrow_viewport) ? '' : 'position-relative col-auto'"
@@ -239,8 +267,10 @@
                                     {% endblock %}
                                 </div>
 
-                                <div class="col-auto px-1">
-                                    {% include 'django_spire/button/primary_button.html' with button_icon='bi bi-x-lg' x_button_click="close_info()" %}
+                                <div class="col-auto pe-4">
+                                    <a role="button" class="link-secondary" @click="close_info()">
+                                        <i class="bi bi-x-lg"></i>
+                                    </a>
                                 </div>
                             </div>
 

django_spire/core/templates/django_spire/table/base.html

@@ -1,5 +1,7 @@
 {% extends 'django_spire/infinite_scroll/base.html' %}
 
+{% block scroll_wrapper_class %}d-flex flex-column{% if not table_height %} h-100{% endif %}{% endblock %}
+
 {% block scroll_xdata %}
     responsive_mode: '{{ responsive_mode|default:"collapse" }}',
     table_id: $id('table'),
@@ -138,8 +140,8 @@
 
 {% block scroll_container %}
     <div
-        class="position-relative table-container"
-        style="height: {{ table_height|default:'600px' }}; overflow-x: auto; overflow-y: auto; overscroll-behavior: contain; -webkit-overflow-scrolling: touch;"
+        class="position-relative table-container {% if not table_height %}flex-grow-1 min-height-0{% endif %}"
+        style="height: {{ table_height|default:'600px' }}; max-height: 100%; overflow-x: auto; overflow-y: auto; overscroll-behavior: contain; -webkit-overflow-scrolling: touch;"
         x-ref="scroll_container"
         :data-table-id="table_id"
     >