Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/deploy_maven_central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,21 @@ jobs:
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

- name: Auto-merge PR on successful deployment
if: success()
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GIT_TOKEN }}
script: |
const pr = context.payload.pull_request;
if (pr) {
await github.rest.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: pr.number,
merge_method: 'merge'
});
console.log(`PR #${pr.number} has been automatically merged after successful deployment`);
}
#####
2 changes: 1 addition & 1 deletion generate/src/jvmMain/kotlin/tagCategories.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import model.TagInfo
// カテゴリーの親子関係を定義
val categoryParents = mapOf(
"PhrasingContent" to "P",
"FlowContent" to "P, Div",
"FlowContent" to "P, Div, EventTarget",
"FlowPhrasing" to "FlowContent, PhrasingContent",
"HeadingContent" to "FlowContent",
"SectioningContent" to "FlowContent",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package net.kigawa.renlin.w3c.category

import net.kigawa.renlin.w3c.category.native.FlowContent
import net.kigawa.renlin.w3c.category.native.PhrasingContent

interface ContentCategory {
// fun newContentDsl(): DSL
// fun component(
Expand All @@ -16,5 +13,4 @@ interface ContentCategory {
// }
}

interface AllContentCategory : ContentCategory, FlowContent, PhrasingContent
interface DslContentCategory<CATEGORY_DSL : DslContentCategory<CATEGORY_DSL>>
interface DslContentCategory<CATEGORY_DSL: DslContentCategory<CATEGORY_DSL>>
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ import net.kigawa.renlin.w3c.category.native.TemplateCategory

/**
* FlowContent represents elements that are part of the flow content category.
* Parent: P, Div
* Parent: P, Div, EventTarget
*/
interface FlowContent : ContentCategory, P, Div, HtmlCategory, HeadCategory, LinkCategory, MetaCategory, BodyCategory, AddressCategory, ArticleCategory, AsideCategory, FooterCategory, HeaderCategory, H1Category, H2Category, H3Category, H4Category, H5Category, H6Category, HgroupCategory, MainCategory, NavCategory, SectionCategory, SearchCategory, BlockquoteCategory, DdCategory, DivCategory, DlCategory, DtCategory, FigcaptionCategory, FigureCategory, HrCategory, LiCategory, MenuCategory, OlCategory, PCategory, PreCategory, UlCategory, ACategory, AbbrCategory, BCategory, BdiCategory, BdoCategory, BrCategory, CiteCategory, CodeCategory, DataCategory, DfnCategory, EmCategory, ICategory, KbdCategory, MarkCategory, QCategory, RpCategory, RtCategory, RubyCategory, SCategory, SampCategory, SmallCategory, SpanCategory, StrongCategory, SubCategory, SupCategory, TimeCategory, UCategory, VarCategory, WbrCategory, AreaCategory, AudioCategory, ImgCategory, MapCategory, TrackCategory, VideoCategory, EmbedCategory, FencedframeCategory, IframeCategory, ObjectCategory, PictureCategory, SourceCategory, SvgCategory, MathCategory, CanvasCategory, NoscriptCategory, ScriptCategory, DelCategory, InsCategory, CaptionCategory, ColCategory, ColgroupCategory, TableCategory, TbodyCategory, TdCategory, TfootCategory, ThCategory, TheadCategory, TrCategory, ButtonCategory, DatalistCategory, FieldsetCategory, FormCategory, InputCategory, LabelCategory, LegendCategory, MeterCategory, OptgroupCategory, OptionCategory, OutputCategory, ProgressCategory, SelectCategory, SelectedcontentCategory, TextareaCategory, DetailsCategory, DialogCategory, SummaryCategory, SlotCategory, TemplateCategory
interface FlowContent : ContentCategory, P, Div, EventTarget, HtmlCategory, HeadCategory, LinkCategory, MetaCategory, BodyCategory, AddressCategory, ArticleCategory, AsideCategory, FooterCategory, HeaderCategory, H1Category, H2Category, H3Category, H4Category, H5Category, H6Category, HgroupCategory, MainCategory, NavCategory, SectionCategory, SearchCategory, BlockquoteCategory, DdCategory, DivCategory, DlCategory, DtCategory, FigcaptionCategory, FigureCategory, HrCategory, LiCategory, MenuCategory, OlCategory, PCategory, PreCategory, UlCategory, ACategory, AbbrCategory, BCategory, BdiCategory, BdoCategory, BrCategory, CiteCategory, CodeCategory, DataCategory, DfnCategory, EmCategory, ICategory, KbdCategory, MarkCategory, QCategory, RpCategory, RtCategory, RubyCategory, SCategory, SampCategory, SmallCategory, SpanCategory, StrongCategory, SubCategory, SupCategory, TimeCategory, UCategory, VarCategory, WbrCategory, AreaCategory, AudioCategory, ImgCategory, MapCategory, TrackCategory, VideoCategory, EmbedCategory, FencedframeCategory, IframeCategory, ObjectCategory, PictureCategory, SourceCategory, SvgCategory, MathCategory, CanvasCategory, NoscriptCategory, ScriptCategory, DelCategory, InsCategory, CaptionCategory, ColCategory, ColgroupCategory, TableCategory, TbodyCategory, TdCategory, TfootCategory, ThCategory, TheadCategory, TrCategory, ButtonCategory, DatalistCategory, FieldsetCategory, FormCategory, InputCategory, LabelCategory, LegendCategory, MeterCategory, OptgroupCategory, OptionCategory, OutputCategory, ProgressCategory, SelectCategory, SelectedcontentCategory, TextareaCategory, DetailsCategory, DialogCategory, SummaryCategory, SlotCategory, TemplateCategory
2 changes: 2 additions & 0 deletions sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration
import net.kigawa.renlin.w3c.category.native.FlowContent
import net.kigawa.renlin.w3c.category.native.PhrasingContent
import net.kigawa.renlin.w3c.category.t
import net.kigawa.renlin.w3c.event.tag.onClick


class Sub {
Expand All @@ -38,6 +39,7 @@ class Sub {
alignItems = AlignItems.CENTER
justifyContent = JustifyContent.CENTER
}
onClick { }
}

div("content-section") {
Expand Down