dsh-ptc-plus 0.4.8 → 0.5.0

package/src/client-capability-sort.js

@@ -0,0 +1,29 @@
+export const CAPABILITY_SORT_COLUMNS = [
+  { key: 'name', label: 'member' },
+  { key: 'type', label: 'typesColumn' },
+  { key: 'source', label: 'sourceColumn' },
+  { key: 'availability', label: 'enabledColumn' },
+  { key: 'context', label: 'contextColumn' },
+]
+
+export function cycleCapabilitySort(current, column) {
+  if (current?.column !== column) return { column, direction: 'ascending' }
+  return current.direction === 'ascending' ? { column, direction: 'descending' } : null
+}
+
+export function capabilitySortDirection(current, column) {
+  return current?.column === column ? current.direction : 'none'
+}
+
+/** Callers supply their displayed values and existing default presentation order. */
+export function sortCapabilityEntries(entries, current, valueFor) {
+  if (!current) return [...entries]
+  const direction = current.direction === 'descending' ? -1 : 1
+  const value = entry => {
+    const result = valueFor(entry, current.column)
+    return typeof result === 'number' ? result : String(result ?? '').toLowerCase()
+  }
+  return entries.map((entry, index) => ({ entry, index, value: value(entry) }))
+    .sort((a, b) => direction * (a.value < b.value ? -1 : a.value > b.value ? 1 : 0) || a.index - b.index)
+    .map(item => item.entry)
+}

package/src/client-code-editor.js

@@ -4,6 +4,7 @@ import { EditorView, keymap } from '@codemirror/view'
 import { HighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import { javascript } from '@codemirror/lang-javascript'
 import { tags } from '@lezer/highlight'
+import { adoptUnownedStyles, captureUnownedStyles } from './client-styles.js'
 
 const editorTheme = EditorView.theme({
   '&': { backgroundColor: 'var(--dsw-alias-bg-layer-3)', color: 'var(--dsw-alias-label-primary)', fontSize: '12px' },
@@ -40,6 +41,10 @@ export function createTypeScriptEditor(React) {
     const accessExtensions = () => [EditorState.readOnly.of(disabled), EditorView.editable.of(!disabled)]
 
     React.useLayoutEffect(() => {
+      // style-mod mounts one global sheet per document and cannot tag it, so
+      // the plugin that mounts the editor claims the sheet this mount added
+      // before any other client plugin can take it over.
+      const unowned = captureUnownedStyles()
       const editor = new EditorView({
         parent: parent.current,
         state: EditorState.create({ doc: value, extensions: [
@@ -63,6 +68,7 @@ export function createTypeScriptEditor(React) {
           }),
         ] }),
       })
+      adoptUnownedStyles(unowned)
       view.current = editor
       return () => { view.current = null; editor.destroy() }
     }, [documentId])