Dear @tinjessen
I am finding no luck trying to get the way you need it to work, with doing it manually, i think you will have to design accordingly i'm afraid:
Screen Shot 2021-01-10 at 1.25.31 PM.png
Screen Shot 2021-01-10 at 1.25.38 PM.png
Recreating the Class / data structure of the short-code feature doesn't seem to work they way i had hoped.
I think you will need to seperate the text/shortcode elements
Best wishes & once again sorry for any inconvenience the compromise may cause
Richard