@steedos/service-plugin-amis 3.0.0-beta.15 → 3.0.0-beta.151

package/main/default/client/amis.actions.client.js

@@ -30,10 +30,7 @@ const draftsApiAdaptor = `
         }
     }
     var instance = payload.inserts[0];
-    var url = Steedos.absoluteUrl("/app/" + FlowRouter.current().params.app_id + "/instances/view/" + instance._id + "?display=" + (Steedos.Page.getDisplay('instances') || '') + "&side_object=instances&side_listview_id=draft");
-    // 这里不可以直接openWindow，因为手机浏览器上打不开新窗口，迁移到下面的afterDrafts脚本中，在custom动作单独执行openWindow才行
-    // Steedos.openWindow(url);
-    // if(!Steedos.isMobile()){ FlowRouter.reload();} 
+    var url = Steedos.absoluteUrl("/app/" + context.app_id + "/instances/view/" + instance._id + "?display=" + (Steedos.Page.getDisplay('instances') || '') + "&side_object=instances&side_listview_id=draft");
     payload.draftUrl = url;
     return payload;
 `;
@@ -41,7 +38,7 @@ const draftsApiAdaptor = `
 const afterDrafts = `
     var url = event.data.draftUrl;
     Steedos.openWindow(url);
-    if(!Steedos.isMobile()){ FlowRouter.reload();} 
+    window.navigate(0);
 `;
 
 amisLib.registerAction('steedos_actions_standard_approve', {
@@ -49,7 +46,7 @@ amisLib.registerAction('steedos_actions_standard_approve', {
         return amisLib.runActions([
             {
                 "actionType": "custom",
-                "script": "var objectName = event.data.objectName || event.data.object_name;const flows = lodash.filter(Creator.object_workflows, (item) => { return item.object_name == objectName && (!item.sync_direction || item.sync_direction == 'both' || item.sync_direction == 'obj_to_ins') })\n\nevent.setData({ ...event.data, ...{ flows: flows, flowCount: flows.length } })\n\n"
+                "script": "var objectName = event.data.objectName || event.data.object_name;const flows = lodash.filter(Steedos.object_workflows, (item) => { return item.object_name == objectName && (!item.sync_direction || item.sync_direction == 'both' || item.sync_direction == 'obj_to_ins') })\n\nevent.setData({ ...event.data, ...{ flows: flows, flowCount: flows.length } })\n\n"
             },
             {
                 "actionType": "ajax",
@@ -132,7 +129,7 @@ amisLib.registerAction('steedos_actions_standard_approve', {
                                                             "url": "${context.rootUrl}/api/object/workflow/drafts",
                                                             "method": "post",
                                                             "requestAdaptor":"api.data = {\n    \'Instances\': [{\n        \'flow\': api.body.flowId,\n        \'applicant\': api.body.context.userId,\n        \'space\': api.body.context.tenantId,\n        \'record_ids\': [{ o: api.body.objectName, ids: [api.body.recordId] }]\n    }]\n}\n\nreturn api;",
-                                                            "adaptor":"\nif (payload.error) { \n  return {\n    status: 2,\n    msg: payload.error\n  }\n}\nconst instance = payload.inserts[0];\nSteedos.openWindow(Steedos.absoluteUrl(\'/app/\' + FlowRouter.current().params.app_id + \'/instances/view/\' + instance._id + \'?display=\' + (Steedos.Page.getDisplay('instances') || '') + \'&side_object=instances&side_listview_id=draft\'))\nFlowRouter.reload();\nreturn payload;",
+                                                            "adaptor":"\nif (payload.error) { \n  return {\n    status: 2,\n    msg: payload.error\n  }\n}\nconst instance = payload.inserts[0];\nSteedos.openWindow(Steedos.absoluteUrl(\'/app/\' + context.app_id + \'/instances/view/\' + instance._id + \'?display=\' + (Steedos.Page.getDisplay('instances') || '') + \'&side_object=instances&side_listview_id=draft\'))\nwindow.navigate(0);\nreturn payload;",
                                                             "messages": {},
                                                             "headers": {
                                                                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"

package/main/default/client/amis.render.client.js

@@ -29,11 +29,6 @@
           
             return true;
           }
-
-        // 加载Amis SDK: 如果直接放到body中会导致 meteor 编译后的 cordova.js 加载报错
-        // let amisSDKScript = document.createElement("script");
-        // amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/amis/sdk/sdk.js'));
-        // document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
     } catch (error) {
         console.error(error)
     };
@@ -257,13 +252,8 @@
 
                   // 主要是支持 nav 中的跳转
                   if (action && to && action.target) {
-                      if(Meteor.isCordova && to.indexOf('http') != 0){
-                        window.open(Steedos.absoluteUrl(to), action.target);
-                        return;
-                      }else{
-                        window.open(to, action.target);
-                        return;
-                      }
+                      window.open(to, action.target);
+                      return;
                   }
 
                   if (/^https?:\/\//.test(to)) {
@@ -281,10 +271,6 @@
                     }
                     // url是相对路径
                     if(config.url && (!/^http[s]?:\/\//i.test(config.url))){
-                      if(Meteor.isCordova){
-                        config.url = Meteor.absoluteUrl(config.url)
-                      }
-
                       if(!config.headers){
                         config.headers = {}
                       }
@@ -292,17 +278,6 @@
                       if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
                         config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
                       }
-                    }else if(config.url && Meteor.isCordova && Builder.settings.context && Builder.settings.context.rootUrl && config.url.startsWith(Builder.settings.context.rootUrl)){
-                      // 是绝对路径,且是cordova环境, 且以root url开头, 则自动处理认证
-                      if(Meteor.isCordova){
-                        if(!config.headers){
-                          config.headers = {}
-                        }
-              
-                        if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
-                          config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
-                        }
-                      }
                     }
                     return config;
                 },
@@ -418,23 +393,6 @@
             };
 
             const initMonaco = ()=>{
-
-                // const { detect } = require('detect-browser');
-
-                // const browser = detect();
-
-                // // 低于86版的chrome 不支持code类型字段及功能
-                // if (browser && browser.name === 'chrome' && Number(browser.version.split(".")[0]) < 86) {
-                //     return Promise.resolve(true)
-                // }
-
-                // // 手机版暂不支持code类型字段.
-                // if(Meteor.isCordova){
-                //     return Promise.resolve(true)
-                // }else{
-                //     return Builder.initMonaco()
-                // }
-
                 return Promise.resolve(true)
             }
             //Amis SDK 中已清理了monaco, 所以这里需要提前注册,否则会导致amis code类型报错

package/main/default/pages/action_field_updates_form.page.amis.json

@@ -141,16 +141,19 @@
                     "multiple": false
                   },
                   {
-                    "name": "formula",
-                    "label": "${'action_field_updates.action_field_updates_form.formula' | t}",
-                    "required": false,
-                    "type": "textarea",
-                    "tpl": "<b><%=data.formula%></b>",
+                    "type": "service",
+                    "schemaApi": {
+                      "method": "get",
+                      "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${target_object}/fields/options",
+                      "cache": 30000,
+                      "adaptor": "const field = {label: t('action_field_updates.action_field_updates_form.formula')}; const variables = SteedosUI.getFormulaVariables(payload.data.options);\n var fieldSchema={label: field.label, type:'input-formula', name: 'formula', 'evalMode': false, variableMode: 'tabs', variables: variables, labelRemark: field.inlineHelpText, description: field.description } \n return {...payload, data:fieldSchema};",
+                      "trackExpression": "${target_object}",
+                      "sendOn": "${target_object}"
+                    },
+                    "dsType": "api",
+                    "id": "u:508198dbfac7",
                     "className": "col-span-2 m-1",
                     "labelClassName": "text-left",
-                    "clearValueOnHidden": true,
-                    "fieldName": "formula",
-                    "id": "u:20766a86a9f4",
                     "hiddenOn": "this.operation != 'formula'"
                   },
                   {

package/main/default/pages/generate_object_tabs.page.amis.json

@@ -76,7 +76,6 @@
     ],
     "data": {
         "context": {
-            "rootUrl": "http://127.0.0.1:5800"
         }
     },
     "id": "u:3b0de7e88def",

package/main/default/pages/listview_form.page.amis.json

@@ -289,7 +289,7 @@
           }
         },
         "initApiAdaptor": "\nvar data;\nif (recordId) {\n  data = payload.data || { _filters_type_controller: 'conditions' };\n  //数据格式转换\n  if (data) {\n    data.sort = lodash.map(data.sort, (item) => {\n      return item.field_name + \":\" + item.order;\n    });\n    data.searchable_fields = lodash.map(data.searchable_fields, 'field');\n\n    if (data.filters && lodash.isString(data.filters)) {\n      try {\n        data.filters = JSON.parse(data.filters);\n      } catch (e) { }\n    }\n\n    if (data.filters && lodash.isString(data.filters)) {\n      data._filters_type_controller = 'function';\n    } else {\n      data._filters_type_controller = 'conditions'\n    }\n\n    if (data._filters_type_controller === 'conditions') {\n      data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);\n    } else {\n      data._filters_function = data.filters;\n    }\n  }\n} else {\n const uiSchema = api.body.uiSchema;\n const contextDefaultData = context && context.data && context.data.defaultData; const defaultData = api.body.defaultData || contextDefaultData;\n  let defaultValues = {};\n _.each(uiSchema && uiSchema.fields, function (field) {\n    var value = SteedosUI.getFieldDefaultValue(field, api.body.global);\n    if (!_.isNil(value)) {\n      defaultValues[field.name] = value;\n    }\n  });\n if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n    data = Object.assign({}, defaultValues, defaultData); \n  }else{data = Object.assign({}, defaultValues) } \n}\nfor (key in data) {\n  if (data[key] === null) {\n    delete data[key];\n  }\n}\npayload.data = data;\ndelete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };\nreturn payload;",
-        "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n  return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n  formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n  // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n  query = `mutation{record: object_listviews__update(id: \"` + formData._id + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
+        "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n  return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n  formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n  // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n  query = `mutation{record: object_listviews__update(id: \"` + api.body.recordId + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
         "id": "u:ce9e3fcc411a"
       }
     ],
@@ -304,16 +304,5 @@
     "initApi": null,
     "initFetch": null,
     "id": "u:6ada123f9d4a",
-    "onEvent": {
-      "init": {
-        "weight": 0,
-        "actions": [
-          {
-            "actionType": "custom",
-            "script": "//初始化时给外层dialog加上类名，使过滤组件popover正常显示\n$('.steedos-object-listview-form-page').closest('.amis-dialog-widget.antd-Modal').addClass('steedos-overflow-visible-dialog');"
-          }
-        ]
-      }
-    },
     "className": "steedos-object-listview-form-page"
 }

package/main/default/services/amis-design.service.js

@@ -302,8 +302,9 @@ module.exports = {
                         fields: 1
                     }
                 };
+                const forceUnHiddenObjectNames = ["cms_files", "tasks", "notes", "events", "instances", "approvals", "process_instance_history",  "audit_records"];
                 let objects = _.map(_.filter((allObjects), (obj)=>{
-                    return obj.hidden != true;
+                    return obj.hidden != true || forceUnHiddenObjectNames.includes(obj.name);
                 }), (obj)=>{
                     return {
                         name: obj.name,

package/main/default/services/metadata/listviews.service.js

@@ -146,7 +146,8 @@ const getDateTimeOperators = (lng)=>{
 }
 
 
-const getFieldOperators = (type, lng)=>{
+const getFieldOperators = (type, lng, ctx = {})=>{
+    let { multiple } = ctx;
     switch (type) {
         case 'text':
             return ['equal', 'not_equal', 'like', 'not_like', 'starts_with', 'ends_with']
@@ -162,6 +163,9 @@ const getFieldOperators = (type, lng)=>{
         case 'lookup':
         case 'master_detail':
         case 'select':
+            if (multiple){
+                return ['select_any_in', 'select_not_any_in']
+            }
             return [ 'select_equals', 'select_not_equals', 'select_any_in', 'select_not_any_in' ]
         default:
             return ;
@@ -169,7 +173,7 @@ const getFieldOperators = (type, lng)=>{
 
 }
 
-const getField = (objectName, fieldName, type, lng)=>{
+const getField = (objectName, fieldName, type, lng, ctx = {})=>{
     let field = null;
     switch (type) {
         case 'textarea':
@@ -195,7 +199,7 @@ const getField = (objectName, fieldName, type, lng)=>{
         case 'date':
             // 华炎魔方中日期字段存的是utc的0点
             field = {
-                type: "date",
+                type: "text",
                 format: "YYYY-MM-DDT00:00:00+00:00",
                 operators: getFieldOperators("date", lng)
             };
@@ -203,7 +207,7 @@ const getField = (objectName, fieldName, type, lng)=>{
         case 'datetime':
             // 即amis中日期时间控件的format默认值为"YYYY-MM-DDTHH:mm+08:00"正好满足需求
             field = {
-                type: "datetime",
+                type: "text",
                 operators: getFieldOperators("datetime", lng)
             };
             break;
@@ -217,6 +221,11 @@ const getField = (objectName, fieldName, type, lng)=>{
             break;
         case 'lookup':
         case 'master_detail':
+            field = {
+                type: 'text',
+                operators: getFieldOperators("select", lng, ctx)
+            };
+            break;
         case 'select':
             field = {
                 type: 'select',
@@ -230,7 +239,7 @@ const getField = (objectName, fieldName, type, lng)=>{
                   }
                 ,
                 searchable: true,
-                operators: getFieldOperators("select", lng)
+                operators: getFieldOperators("select", lng, ctx)
             };
             break;
         case 'boolean':
@@ -361,7 +370,7 @@ module.exports = {
                                 fields.push({
                                     label: field.label,
                                     name: field.name,
-                                    ...getField(objectName, field.name, field.type, lng)
+                                    ...getField(objectName, field.name, field.type, lng, { multiple: field.multiple})
                                 })
                                 break;
                         }

package/main/default/services/utils/page-schema.js

@@ -41,7 +41,7 @@ const getListPageInitSchema = function (objectApiName) {
     return {
         type: 'page',
         name: getScopeId(objectApiName, "list"),
-        bodyClassName: '',
+        bodyClassName: 'p-0',
         regions: [
             "body"
         ],
@@ -88,7 +88,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
     }
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded",
+        "className": "steedos-record-tabs bg-white p-4 sm:m-4 sm:shadow sm:rounded",
         "tabs": [
             detailed
         ]
@@ -112,7 +112,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
         name: getScopeId(objectApiName, "record_detail"),
         objectApiName: "${objectName}",
         bodyClassName: '',
-        className: "object-detail-page steedos-record-content overflow-y-auto p-0 m-0 flex-1 h-full bg-gray-100",
+        className: "object-detail-page steedos-record-content overflow-y-auto p-0 m-0 flex-1 h-full",
         regions: [
             "body"
         ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "3.0.0-beta.15",
+  "version": "3.0.0-beta.151",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -9,12 +9,11 @@
     "build:tailwind": "tailwindcss -i ./src/styles/tailwind.css -o ./public/tailwind/tailwind-steedos.css"
   },
   "license": "MIT",
-  "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9abbe903c15c867571f99d946479bff387862e3f",
+  "gitHead": "bd9248bbec1c66e9b2ed1e958f3dba6b70b1476a",
   "devDependencies": {
-    "tailwindcss": "3.2.4"
+    "tailwindcss": "^3.4.17"
   }
 }

package/package.service.js

@@ -36,7 +36,7 @@ module.exports = {
 	/**
 	 * Dependencies
 	 */
-	dependencies: ['~packages-@steedos/service-pages'],
+	dependencies: ['@steedos/service-pages'],
 
 	/**
 	 * Actions

package/public/tailwind/tailwind-base.css

@@ -1,5 +1,113 @@
+*, ::before, ::after {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-gradient-from-position:  ;
+  --tw-gradient-via-position:  ;
+  --tw-gradient-to-position:  ;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+  --tw-contain-size:  ;
+  --tw-contain-layout:  ;
+  --tw-contain-paint:  ;
+  --tw-contain-style:  ;
+}
+
+::backdrop {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-gradient-from-position:  ;
+  --tw-gradient-via-position:  ;
+  --tw-gradient-to-position:  ;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+  --tw-contain-size:  ;
+  --tw-contain-layout:  ;
+  --tw-contain-paint:  ;
+  --tw-contain-style:  ;
+}
+
 /*
-! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.18 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -31,9 +139,12 @@
 3. Use a more readable tab size.
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
+6. Use the user's configured `sans` font-variation-settings by default.
+7. Disable tap highlights on iOS
 */
 
-html {
+html,
+:host {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -43,10 +154,14 @@ html {
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
+  font-variation-settings: normal;
+  /* 6 */
+  -webkit-tap-highlight-color: transparent;
+  /* 7 */
 }
 
 /*
@@ -118,8 +233,10 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font family by default.
-2. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font-family by default.
+2. Use the user's configured `mono` font-feature-settings by default.
+3. Use the user's configured `mono` font-variation-settings by default.
+4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -128,8 +245,12 @@ samp,
 pre {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-size: 1em;
+  font-feature-settings: normal;
   /* 2 */
+  font-variation-settings: normal;
+  /* 3 */
+  font-size: 1em;
+  /* 4 */
 }
 
 /*
@@ -188,12 +309,18 @@ select,
 textarea {
   font-family: inherit;
   /* 1 */
+  font-feature-settings: inherit;
+  /* 1 */
+  font-variation-settings: inherit;
+  /* 1 */
   font-size: 100%;
   /* 1 */
   font-weight: inherit;
   /* 1 */
   line-height: inherit;
   /* 1 */
+  letter-spacing: inherit;
+  /* 1 */
   color: inherit;
   /* 1 */
   margin: 0;
@@ -217,9 +344,9 @@ select {
 */
 
 button,
-[type='button'],
-[type='reset'],
-[type='submit'] {
+input:where([type='button']),
+input:where([type='reset']),
+input:where([type='submit']) {
   -webkit-appearance: button;
   /* 1 */
   background-color: transparent;
@@ -338,6 +465,14 @@ menu {
   padding: 0;
 }
 
+/*
+Reset default styling for dialogs.
+*/
+
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */
@@ -415,100 +550,6 @@ video {
 
 /* Make elements with the HTML hidden attribute stay hidden by default */
 
-[hidden] {
+[hidden]:where(:not([hidden="until-found"])) {
   display: none;
-}
-
-*, ::before, ::after {
-  --tw-border-spacing-x: 0;
-  --tw-border-spacing-y: 0;
-  --tw-translate-x: 0;
-  --tw-translate-y: 0;
-  --tw-rotate: 0;
-  --tw-skew-x: 0;
-  --tw-skew-y: 0;
-  --tw-scale-x: 1;
-  --tw-scale-y: 1;
-  --tw-pan-x:  ;
-  --tw-pan-y:  ;
-  --tw-pinch-zoom:  ;
-  --tw-scroll-snap-strictness: proximity;
-  --tw-ordinal:  ;
-  --tw-slashed-zero:  ;
-  --tw-numeric-figure:  ;
-  --tw-numeric-spacing:  ;
-  --tw-numeric-fraction:  ;
-  --tw-ring-inset:  ;
-  --tw-ring-offset-width: 0px;
-  --tw-ring-offset-color: #fff;
-  --tw-ring-color: rgb(59 130 246 / 0.5);
-  --tw-ring-offset-shadow: 0 0 #0000;
-  --tw-ring-shadow: 0 0 #0000;
-  --tw-shadow: 0 0 #0000;
-  --tw-shadow-colored: 0 0 #0000;
-  --tw-blur:  ;
-  --tw-brightness:  ;
-  --tw-contrast:  ;
-  --tw-grayscale:  ;
-  --tw-hue-rotate:  ;
-  --tw-invert:  ;
-  --tw-saturate:  ;
-  --tw-sepia:  ;
-  --tw-drop-shadow:  ;
-  --tw-backdrop-blur:  ;
-  --tw-backdrop-brightness:  ;
-  --tw-backdrop-contrast:  ;
-  --tw-backdrop-grayscale:  ;
-  --tw-backdrop-hue-rotate:  ;
-  --tw-backdrop-invert:  ;
-  --tw-backdrop-opacity:  ;
-  --tw-backdrop-saturate:  ;
-  --tw-backdrop-sepia:  ;
-}
-
-::backdrop {
-  --tw-border-spacing-x: 0;
-  --tw-border-spacing-y: 0;
-  --tw-translate-x: 0;
-  --tw-translate-y: 0;
-  --tw-rotate: 0;
-  --tw-skew-x: 0;
-  --tw-skew-y: 0;
-  --tw-scale-x: 1;
-  --tw-scale-y: 1;
-  --tw-pan-x:  ;
-  --tw-pan-y:  ;
-  --tw-pinch-zoom:  ;
-  --tw-scroll-snap-strictness: proximity;
-  --tw-ordinal:  ;
-  --tw-slashed-zero:  ;
-  --tw-numeric-figure:  ;
-  --tw-numeric-spacing:  ;
-  --tw-numeric-fraction:  ;
-  --tw-ring-inset:  ;
-  --tw-ring-offset-width: 0px;
-  --tw-ring-offset-color: #fff;
-  --tw-ring-color: rgb(59 130 246 / 0.5);
-  --tw-ring-offset-shadow: 0 0 #0000;
-  --tw-ring-shadow: 0 0 #0000;
-  --tw-shadow: 0 0 #0000;
-  --tw-shadow-colored: 0 0 #0000;
-  --tw-blur:  ;
-  --tw-brightness:  ;
-  --tw-contrast:  ;
-  --tw-grayscale:  ;
-  --tw-hue-rotate:  ;
-  --tw-invert:  ;
-  --tw-saturate:  ;
-  --tw-sepia:  ;
-  --tw-drop-shadow:  ;
-  --tw-backdrop-blur:  ;
-  --tw-backdrop-brightness:  ;
-  --tw-backdrop-contrast:  ;
-  --tw-backdrop-grayscale:  ;
-  --tw-backdrop-hue-rotate:  ;
-  --tw-backdrop-invert:  ;
-  --tw-backdrop-opacity:  ;
-  --tw-backdrop-saturate:  ;
-  --tw-backdrop-sepia:  ;
 }